Skip to content

Refactor state helpers #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sls0n wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor state helpers #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions components/editor/background-options/normal-gradient-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default function NormalGradientPicker() {
setNoise,
} = useBackgroundOptions()

const { images, setImages } = useImageOptions()
const { images, updateImage } = useImageOptions()
const { selectedImage } = useSelectedLayers()
const [dominantColor, setDominantColor] = useState(null)

Expand Down Expand Up @@ -132,20 +132,15 @@ export default function NormalGradientPicker() {
return gradient
})

setImages(
images.map((image, index) =>
index === images.length - 1
? {
...image,
dominantColor,
palletes,
linearGradients,
meshGradients,
radialGradients,
}
: image
)
)
if (images.length > 0) {
updateImage(images[images.length - 1].id, {
dominantColor,
palletes,
linearGradients,
meshGradients,
radialGradients,
})
}

return {
linearGradients,
Expand Down
36 changes: 7 additions & 29 deletions components/editor/canvas-options/resolution-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function ResolutionButton({
const [isHovering, setIsHovering] = useState(false)

const { setResolution, setScaleFactor, domResolution } = useResizeCanvas()
const { images, setImages, initialImageUploaded } = useImageOptions()
const { images, updateImageStyle, initialImageUploaded } = useImageOptions()
const { selectedImage } = useSelectedLayers()

const [domWidth]: number[] = domResolution.split('x').map(Number)
Expand Down Expand Up @@ -84,20 +84,9 @@ export function ResolutionButton({
padding
)
setResolution(newResolution.toString())
selectedImage &&
setImages(
images.map((image, index) =>
index === selectedImage - 1
? {
...image,
style: {
...image.style,
imageSize: '0.75',
},
}
: image
)
)
if (selectedImage) {
updateImageStyle(selectedImage, { imageSize: '0.75' })
}
}
}}
aria-label={name}
Expand Down Expand Up @@ -129,20 +118,9 @@ export function ResolutionButton({
padding
)
setResolution(newResolution.toString())
selectedImage &&
setImages(
images.map((image, index) =>
index === selectedImage - 1
? {
...image,
style: {
...image.style,
imageSize: '0.75',
},
}
: image
)
)
if (selectedImage) {
updateImageStyle(selectedImage, { imageSize: '0.75' })
}
}
}}
aria-label={name}
Expand Down
26 changes: 9 additions & 17 deletions components/editor/frame-options/frame-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,18 @@ import { cn } from '@/utils/button-utils'
export default function FramePicker() {
const { setFrameHeight, frameHeight } = useFrameOptions()
const { selectedImage } = useSelectedLayers()
const { setImages, images } = useImageOptions()
const { updateImage, images } = useImageOptions()
const { setShowControls } = useMoveable()

const frameChangeHandler = (frame: FrameTypes) => {
selectedImage &&
setImages(
images.map((image, index) =>
index === selectedImage - 1
? {
...image,
frame,
style: {
...image.style,
imageRoundness:
frame === 'None' ? 0.4 : frame === 'Arc' ? 1.5 : 0.7,
},
}
: image
)
)
if (selectedImage) {
updateImage(selectedImage, {
frame,
style: {
imageRoundness: frame === 'None' ? 0.4 : frame === 'Arc' ? 1.5 : 0.7,
},
})
}
setShowControls(false)
}

Expand Down
91 changes: 25 additions & 66 deletions components/editor/image-context-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default function ContextMenuImage({
height: 50,
})
const imgRef = useRef<HTMLImageElement>(null)
const { setImages, images } = useImageOptions()
const { updateImage, updateImageStyle, images } = useImageOptions()
const [isRemovingBackground, setIsRemovingBackground] = useState(false)
const [isBgRemovalDialogOpen, setIsBgRemovalDialogOpen] = useState(false)
const [isProcessingBackground, setIsProcessingBackground] = useState(false)
Expand All @@ -70,39 +70,20 @@ export default function ContextMenuImage({
}

if (selectedImage) {
setImages(
images.map((image, index) =>
index === selectedImage - 1
? {
...image,
image: '',
}
: image
)
)
updateImage(selectedImage, { image: '' })
}

setSelectedImage(null)
}

const bringToFrontOrBack = (direction: 'front' | 'back') => {
if (selectedImage) {
setImages(
images.map((image, index) =>
index === selectedImage - 1
? {
...image,
style: {
...image.style,
zIndex:
direction === 'front'
? image.style.zIndex + 1
: image.style.zIndex - 1,
},
}
: image
)
)
updateImageStyle(selectedImage, {
zIndex:
direction === 'front'
? images[selectedImage - 1]?.style.zIndex + 1
: images[selectedImage - 1]?.style.zIndex - 1,
})
}
}

Expand Down Expand Up @@ -201,17 +182,9 @@ export default function ContextMenuImage({
)

const base64Image = canvas.toDataURL('image/png')
selectedImage &&
setImages(
images.map((image, index) =>
index === selectedImage - 1
? {
...image,
image: base64Image,
}
: image
)
)
if (selectedImage) {
updateImage(selectedImage, { image: base64Image })
}
}

return (
Expand Down Expand Up @@ -429,21 +402,13 @@ export default function ContextMenuImage({
<Button
onClick={() => {
if (selectedImage && processedImageUrl) {
setImages(
images.map((img, index) =>
index === selectedImage - 1
? {
...img,
image: processedImageUrl,
style: {
...img.style,
shadowName: 'None',
imageShadow: '0 0 0 0',
},
}
: img
)
)
updateImage(selectedImage, {
image: processedImageUrl,
style: {
shadowName: 'None',
imageShadow: '0 0 0 0',
},
})
}
setIsBgRemovalDialogOpen(false)
setProcessedImageUrl(null)
Expand All @@ -463,7 +428,7 @@ export default function ContextMenuImage({
}

function ReplaceImage() {
const { setImages, images } = useImageOptions()
const { updateImage, images } = useImageOptions()
const { selectedImage, setSelectedImage } = useSelectedLayers()

const { setImagesCheck, imagesCheck } = useColorExtractor()
Expand All @@ -478,18 +443,12 @@ function ReplaceImage() {
})
const extractedColors = result.slice(0, 12)

selectedImage &&
setImages(
images.map((image, index) =>
index === selectedImage - 1
? {
...image,
image: imageUrl,
colors: extractedColors,
}
: image
)
)
if (selectedImage) {
updateImage(selectedImage, {
image: imageUrl,
colors: extractedColors,
})
}

setImagesCheck([...imagesCheck, imageUrl])
}
Expand Down
27 changes: 12 additions & 15 deletions components/editor/image-options/add-image-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,25 @@ import Dropzone from 'react-dropzone'
type AddImageButtonProps = {}

export default function AddImageButton({}: AddImageButtonProps) {
const { setImages, images, defaultStyle } = useImageOptions()
const { addImage, images, defaultStyle } = useImageOptions()
const { imagesCheck, setImagesCheck } = useColorExtractor()
const uploadRef = useRef<HTMLInputElement>(null)
const { automaticResolution, setResolution } = useResizeCanvas()
const [isDragging, setIsDragging] = useState<boolean>(false)

const handleImageUpload = (file: File) => {
const imageUrl = URL.createObjectURL(file)
setImages([
...images,
{
image: imageUrl,
id: images.length + 1,
style:
images.length < 1
? defaultStyle
: {
...defaultStyle,
imageSize: '0.5',
},
},
])
addImage({
image: imageUrl,
id: images.length + 1,
style:
images.length < 1
? defaultStyle
: {
...defaultStyle,
imageSize: '0.5',
},
})
setImagesCheck([...imagesCheck, imageUrl])

if (images.length > 0) return
Expand Down
Loading