@codeleap/web 3.21.3 → 3.21.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeleap/web",
-  "version": "3.21.3",
+  "version": "3.21.5",
   "main": "src/index.ts",
   "repository": {
     "url": "https://github.com/codeleap-uk/internal-libs-monorepo.git",

package/src/components/Checkbox/index.tsx

@@ -129,9 +129,6 @@ export const Checkbox = (props: CheckboxProps) => {
     }}
     order={_checkboxOnLeft ? reversedOrder : InputBaseDefaultOrder}
     style={style}
-    wrapperProps={{
-      onClick: handleChange,
-    }}
   >
     <motion.div
       css={[

package/src/components/Dropzone/index.tsx

@@ -1,6 +1,6 @@
-import { DropzoneFilePreviewProps, DropzoneProps, DropzoneRef } from './types'
+import { DropzoneFilePreviewProps, DropzoneInnerFilePreviewProps, DropzoneProps, DropzoneRef } from './types'
 import { DropzonePresets } from './styles'
-import { IconPlaceholder, PropsOf, onUpdate, useCallback, useDefaultComponentStyle, useNestedStylesByKey, useRef } from '@codeleap/common'
+import { IconPlaceholder, PropsOf, TypeGuards, onUpdate, useCallback, useDefaultComponentStyle, useNestedStylesByKey, useRef } from '@codeleap/common'
 import { FileRejection, useDropzone } from 'react-dropzone'
 import { View, ViewProps } from '../View'
 import { Text } from '../Text'
@@ -23,29 +23,20 @@ function isImage(file) {
   return file?.type?.startsWith('image/')
 }
 
-const FilePreview = ({
-  file,
-  variantStyles,
-  withImagePreview,
-  errors = [],
-  onRemove,
-  fileLeftIcon,
-  fileRightIcon,
-  fileRightIconStyles,
-}: DropzoneFilePreviewProps) => {
-  const hasErrors = errors?.length > 0
-  const _isImage = isImage(file)
-  const isPreview = withImagePreview && _isImage
-
-  const [imageUrl, setImageUrl] = useState()
-
-  const revokeImageUrl = () => {
-    URL.revokeObjectURL(imageUrl)
-  }
-
-  onUpdate(() => {
-    if (_isImage) setImageUrl(URL.createObjectURL(file))
-  }, [file, _isImage])
+const DefaultFilePreview = (props: DropzoneInnerFilePreviewProps) => {
+  const {
+    file,
+    variantStyles,
+    errors = [],
+    onRemove,
+    fileLeftIcon,
+    fileRightIcon,
+    fileRightIconStyles,
+    hasErrors,
+    revokeImageUrl,
+    imageUrl,
+    isPreview,
+  } = props
 
   return (
     <View css={[variantStyles.fileWrapper, hasErrors && variantStyles['fileWrapper:error']]}>
@@ -76,7 +67,45 @@ const FilePreview = ({
         name={fileRightIcon}
         styles={fileRightIconStyles}
       />
-    </View>)
+    </View>
+  )
+}
+
+const FilePreview = (props: DropzoneFilePreviewProps) => {
+  const {
+    file,
+    withImagePreview,
+    errors = [],
+    FilePreviewComponent,
+    ...rest
+  } = props
+  const hasErrors = errors?.length > 0
+  const _isImage = isImage(file)
+  const isPreview = withImagePreview && _isImage
+
+  const [imageUrl, setImageUrl] = useState()
+
+  const revokeImageUrl = () => {
+    URL.revokeObjectURL(imageUrl)
+  }
+
+  onUpdate(() => {
+    if (_isImage) setImageUrl(URL.createObjectURL(file))
+  }, [file, _isImage])
+
+  const _FilePreview = !TypeGuards.isNil(FilePreviewComponent) ? FilePreviewComponent : DefaultFilePreview
+
+  return (
+    <_FilePreview
+      file={file}
+      hasErrors={hasErrors}
+      isPreview={isPreview}
+      imageUrl={imageUrl}
+      revokeImageUrl={revokeImageUrl}
+      errors={errors}
+      {...rest}
+    />
+  )
 }
 
 const DropzoneComponent = (props: DropzoneProps, ref: React.ForwardedRef<DropzoneRef>) => {
@@ -101,6 +130,7 @@ const DropzoneComponent = (props: DropzoneProps, ref: React.ForwardedRef<Dropzon
     onDrop,
     onRemove,
     children,
+    FilePreviewComponent,
     ...rest } = allProps
 
   const [rejectedFilesState,
@@ -169,21 +199,25 @@ const DropzoneComponent = (props: DropzoneProps, ref: React.ForwardedRef<Dropzon
 
         {hasFiles && (
           <View css={variantStyles.filesWrapper}>
-            {acceptedFiles.map(file => (
+            {acceptedFiles.map((file, index) => (
               <FilePreview
                 {...fileProps}
+                index={index}
                 file={file}
                 key={file.name}
                 onRemove={() => handleRemoveFile(file)}
+                FilePreviewComponent={FilePreviewComponent}
               />))}
 
-            {rejectedFiles.map(({ file, errors }) => (
+            {rejectedFiles.map(({ file, errors }, index) => (
               <FilePreview
                 {...fileProps}
+                index={index}
                 key={file.name}
                 file={file}
                 errors={errors}
                 onRemove={() => handleRemoveFile(file, true)}
+                FilePreviewComponent={FilePreviewComponent}
               />))}
           </View>
         )}

package/src/components/Dropzone/types.ts

@@ -35,17 +35,26 @@ export type DropzoneProps = ComponentVariants<typeof DropzonePresets> &
     fileRightIcon?: IconPlaceholder
     fileLeftIcon?: IconPlaceholder
     withImagePreview?: boolean
+    FilePreviewComponent?: (props: DropzoneInnerFilePreviewProps) => JSX.Element
   }
 
 export type DropzoneFilePreviewProps = Pick<
   DropzoneProps,
-  'fileRightIcon' | 'fileLeftIcon' | 'withImagePreview'
+  'fileRightIcon' | 'fileLeftIcon' | 'withImagePreview' | 'FilePreviewComponent'
 > & {
   file: DropzoneFile
   errors?: DropzoneFileRejection['errors']
   variantStyles: StylesOf<DropzoneComposition>
   onRemove?: () => void
   fileRightIconStyles?: StylesOf<ActionIconComposition>
+  index?: number
+}
+
+export type DropzoneInnerFilePreviewProps = DropzoneFilePreviewProps & {
+  hasErrors: boolean
+  revokeImageUrl: () => void
+  imageUrl: string
+  isPreview: boolean
 }
 
 export type DropzoneRef = ReactDropzoneRef & {

package/src/lib/hooks.ts

@@ -8,7 +8,7 @@ export function useWindowSize() {
   const [size, setSize] = useState([])
 
   onMount(() => {
-    setSize([window.innerWidth, window.innerWidth])
+    setSize([window.innerWidth, window.innerHeight])
   })
 
   function handleResize() {