Merge remote-tracking branch 'origin/master' into feature/slicing

app/components/text-editor/editor-button.tsx

@@ -21,7 +21,7 @@ export const EditorButton = (properties: TProperties) => {
       onClick={onClick}
       disabled={disabled}
       className={twMerge(
-        'flex h-6 w-8 cursor-pointer items-center justify-center rounded-md p-2 hover:bg-[#2E2F7C] hover:text-white disabled:cursor-not-allowed disabled:bg-[#2E2F7C]/50 disabled:text-white disabled:hover:bg-[#2E2F7C]/50',
+        'flex h-6 w-8 cursor-pointer items-center justify-center rounded-md p-2 hover:bg-[#2E2F7C] hover:text-white disabled:cursor-not-allowed disabled:bg-[#2E2F7C]/50 disabled:text-white disabled:opacity-50',
         isActive ? 'bg-[#2E2F7C]/10' : '',
         className,
       )}

app/components/ui/input-file.tsx

@@ -11,6 +11,8 @@ import {
 import { useRemixFormContext } from 'remix-hook-form'
 import { twMerge } from 'tailwind-merge'
 
+import { useAdminContext } from '~/contexts/admin'
+
 import { Button } from './button'
 
 type TInputProperties<T extends FieldValues> = Omit<
@@ -40,6 +42,7 @@ export const InputFile = <TFormValues extends Record<string, unknown>>(
     labelClassName,
     ...restProperties
   } = properties
+  const { setIsUploadOpen } = useAdminContext()
 
   const {
     register,
@@ -59,7 +62,7 @@ export const InputFile = <TFormValues extends Record<string, unknown>>(
       </Label>
       <HeadlessInput
         className={twMerge(
-          'h-[42px] w-full rounded-md border border-[#DFDFDF] p-2',
+          'h-[42px] w-full rounded-md border border-[#DFDFDF] p-2 pr-8',
           className,
         )}
         placeholder={placeholder}
@@ -71,7 +74,9 @@ export const InputFile = <TFormValues extends Record<string, unknown>>(
         variant="icon"
         size="fit"
         className="absolute right-3 h-[42px]"
-        onClick={() => {}}
+        onClick={() => {
+          setIsUploadOpen('featured_image')
+        }}
       >
         <CloudArrowUpIcon className="h-4 w-4 text-gray-500/50" />
       </Button>

app/components/ui/input.tsx

@@ -63,7 +63,7 @@ export const Input = <TFormValues extends Record<string, unknown>>(
       <HeadlessInput
         type={inputType}
         className={twMerge(
-          'h-[42px] w-full rounded-md border border-[#DFDFDF] p-2',
+          'h-[42px] w-full rounded-md border border-[#DFDFDF] p-2 pr-8',
           className,
         )}
         placeholder={inputType === 'password' ? '******' : placeholder}