fix: merge conflict problem

apps/docs/src/constant/icons/index.json → apps/docs/src/constant/icons/icons.json

@@ -90,7 +90,54 @@
     "WindowMaximize",
     "WindowMinimize"
   ],
-  "arrows": ["Maximize", "Minimize"],
+  "arrows": [
+    "ArrowBarDown",
+    "ArrowBarRight",
+    "ArrowBarLeft",
+    "ArrowBarTop",
+    "ArrowCircleDown",
+    "ArrowCircleRight",
+    "ArrowCircleTop",
+    "ArrowCircleLeft",
+    "ArrowDown",
+    "ArrowLeft",
+    "ArrowRight",
+    "ArrowTop",
+    "ArrowsDoubleDown",
+    "ArrowsDoubleLeft",
+    "ArrowsDoubleRight",
+    "ArrowsDoubleTop",
+    "ArrowsDown",
+    "ArrowsRight",
+    "ArrowsLeft",
+    "ArrowsTop",
+    "BigArrowDown",
+    "BigArrowRight",
+    "BigArrowLeft",
+    "BigArrowTop",
+    "CaretDown",
+    "CaretRight",
+    "CaretLeft",
+    "CaretTop",
+    "ChevronDown",
+    "ChevronTop",
+    "ChevronLeft",
+    "ChevronRight",
+    "ChevronsDown",
+    "ChevronsTop",
+    "ChevronsLeft",
+    "ChevronsRight",
+    "CornerDoubleDown",
+    "CornerDoubleLeft",
+    "CornerDoubleRight",
+    "CornerDoubleTop",
+    "CornerRightArrow",
+    "CornerDownArrow",
+    "CornerTopArrow",
+    "CornerLeftArrow",
+    "Maximize",
+    "Minimize"
+  ],
   "brand": [
     "Adobe",
     "Airbnb",

apps/docs/src/pages/docs/icons.tsx

@@ -3,7 +3,7 @@ import { DocsLayout } from 'src/component/common'
 import * as ICONS from '@pillar-ui/icons'
 import { Button, Flex, Grid, Paper, Text } from '@pillar-ui/core'
 import { useCopyToClipboard } from '@pillar-ui/hooks'
-import iconJson from '../../constant/icons/index.json'
+import iconJson from '../../constant/icons/icons.json'
 
 const CATEGORIES: string[] = ['all', ...Object.keys(iconJson)]
 
@@ -61,8 +61,8 @@ const Icons = () => {
             </Button>
           ))}
         </Flex>
-        <div>
-          <Grid style={{ '--button-corner': 0 } as CSSProperties} gap="sm" grid="repeat(auto-fit, minmax(150px, 1fr)">
+        <div style={{ '--button-corner': 0 } as CSSProperties}>
+          <Grid gap="sm" grid="repeat(auto-fit, minmax(130px, 1fr)">
             {lists.map((item) => (
               <IconsItem item={item} />
             ))}

packages/pillar-core/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @pillar/core
 
+## 0.5.0
+
+### Minor Changes
+
+- # New Changes
+
+  - **Commit f1f8ee5**: We’ve fixed an issue by adding types to the package.json exports. This should help improve the overall functionality of the library.
+  - **Commit cef2462**: We’ve removed index.json and made changes to icons.json. This is part of our ongoing effort to streamline our codebase and improve efficiency.
+  - **Commit 3478d24**: We’ve fixed the icon problem that some users were experiencing. This should enhance the user interface and make it more user-friendly.
+
+  ## Conclusion
+
+  These updates are part of our ongoing commitment to improving the Pillar UI library and ensuring it meets the needs of our users. We appreciate your feedback and encourage you to reach out if you encounter any issues or have suggestions for future updates.
+
 ## 0.4.0
 
 ### Minor Changes

packages/pillar-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pillar-ui/core",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "A collection of reusable UI components for modern web development. These components follow best practices, are highly customizable, and promote a consistent user experience across applications.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

packages/pillar-hooks/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @pillar/hooks
 
+## 0.4.0
+
+### Minor Changes
+
+- # New Changes
+
+  - **Commit f1f8ee5**: We’ve fixed an issue by adding types to the package.json exports. This should help improve the overall functionality of the library.
+  - **Commit cef2462**: We’ve removed index.json and made changes to icons.json. This is part of our ongoing effort to streamline our codebase and improve efficiency.
+  - **Commit 3478d24**: We’ve fixed the icon problem that some users were experiencing. This should enhance the user interface and make it more user-friendly.
+
+  ## Conclusion
+
+  These updates are part of our ongoing commitment to improving the Pillar UI library and ensuring it meets the needs of our users. We appreciate your feedback and encourage you to reach out if you encounter any issues or have suggestions for future updates.
+
 ## 0.3.0
 
 ### Minor Changes

packages/pillar-hooks/package.json

@@ -12,7 +12,7 @@
     "name": "Hamza Miloud Amar",
     "email": "[email protected]"
   },
-  "version": "0.3.0",
+  "version": "0.4.0",
   "sideEffects": false,
   "license": "MIT",
   "main": "./dist/index.js",
@@ -30,7 +30,8 @@
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
     }
   },
   "scripts": {

packages/pillar-icons/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @pillar/icons
 
+## 0.5.0
+
+### Minor Changes
+
+- # New Changes
+
+  - **Commit f1f8ee5**: We’ve fixed an issue by adding types to the package.json exports. This should help improve the overall functionality of the library.
+  - **Commit cef2462**: We’ve removed index.json and made changes to icons.json. This is part of our ongoing effort to streamline our codebase and improve efficiency.
+  - **Commit 3478d24**: We’ve fixed the icon problem that some users were experiencing. This should enhance the user interface and make it more user-friendly.
+
+  ## Conclusion
+
+  These updates are part of our ongoing commitment to improving the Pillar UI library and ensuring it meets the needs of our users. We appreciate your feedback and encourage you to reach out if you encounter any issues or have suggestions for future updates.
+
 ## 0.4.0
 
 ### Minor Changes

packages/pillar-icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pillar-ui/icons",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "A library of scalable icons suitable for various web development projects. These icons are highly customizable, accessible, and designed to seamlessly integrate into modern user interfaces.",
   "keywords": [
     "icons",
@@ -28,7 +28,7 @@
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "sideEffects": false,
+  "sideEffects": true,
   "license": "MIT",
   "files": [
     "dist/**"
@@ -40,7 +40,8 @@
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
     }
   },
   "scripts": {

packages/pillar-icons/src/icons/arrows/arrowBarDown.tsx

@@ -1,14 +1,10 @@
 import { ROTATION, svgProps } from '../../shared'
-import { SvgWithDirection, SvgType } from '../../type'
+import { SvgWithDirection } from '../../type'
 
 const ArrowBarDown = ({ direction = 'bottom', ...rest }: SvgWithDirection) => (
   <svg {...svgProps} transform={`rotate(${ROTATION[direction]})`} {...rest}>
     <path d="M12 20V10m0 10 4-4m-4 4-4-4M4 4h16" />
   </svg>
 )
 
-const ArrowBarLeft = ({ direction, ...rest }: SvgType) => <ArrowBarDown direction="left" {...rest} />
-const ArrowBarRight = ({ direction, ...rest }: SvgType) => <ArrowBarDown direction="right" {...rest} />
-const ArrowBarTop = ({ direction, ...rest }: SvgType) => <ArrowBarDown direction="top" {...rest} />
-
-export { ArrowBarDown, ArrowBarLeft, ArrowBarRight, ArrowBarTop }
+export default ArrowBarDown

packages/pillar-icons/src/icons/arrows/arrowBarLeft.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowBarDown from './arrowBarDown'
+
+const ArrowBarLeft = ({ direction, ...rest }: SvgType) => <ArrowBarDown direction="left" {...rest} />
+
+export default ArrowBarLeft

packages/pillar-icons/src/icons/arrows/arrowBarRight.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowBarDown from './arrowBarDown'
+
+const ArrowBarRight = ({ direction, ...rest }: SvgType) => <ArrowBarDown direction="right" {...rest} />
+
+export default ArrowBarRight

packages/pillar-icons/src/icons/arrows/arrowBarTop.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowBarDown from './arrowBarDown'
+
+const ArrowBarTop = ({ direction, ...rest }: SvgType) => <ArrowBarDown direction="top" {...rest} />
+
+export default ArrowBarTop

packages/pillar-icons/src/icons/arrows/arrowCircleDown.tsx

@@ -0,0 +1,10 @@
+import { ROTATION, svgProps } from '../../shared'
+import { SvgWithDirection } from '../../type'
+
+const ArrowCircleDown = ({ direction = 'bottom', ...rest }: SvgWithDirection) => (
+  <svg {...svgProps} transform={`rotate(${ROTATION[direction]})`} {...rest}>
+    <path d="m8 12 4 4m0 0V8m0 8 4-4m5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
+  </svg>
+)
+
+export default ArrowCircleDown

packages/pillar-icons/src/icons/arrows/arrowCircleLeft.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowCircleDown from './arrowCircleDown'
+
+const ArrowCircleLeft = ({ direction, ...rest }: SvgType) => <ArrowCircleDown direction="left" {...rest} />
+
+export default ArrowCircleLeft

packages/pillar-icons/src/icons/arrows/arrowCircleRight.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowCircleDown from './arrowCircleDown'
+
+const ArrowCircleRight = ({ direction, ...rest }: SvgType) => <ArrowCircleDown direction="right" {...rest} />
+
+export default ArrowCircleRight

packages/pillar-icons/src/icons/arrows/arrowCircleTop.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowCircleDown from './arrowCircleDown'
+
+const ArrowCircleTop = ({ direction, ...rest }: SvgType) => <ArrowCircleDown direction="top" {...rest} />
+
+export default ArrowCircleTop

packages/pillar-icons/src/icons/arrows/arrowDown.tsx

@@ -1,14 +1,10 @@
 import { ROTATION, svgProps } from '../../shared'
-import { SvgType, SvgWithDirection } from '../../type'
+import { SvgWithDirection } from '../../type'
 
 const ArrowDown = ({ direction = 'bottom', ...rest }: SvgWithDirection) => (
   <svg {...svgProps} transform={`rotate(${ROTATION[direction]})`} {...rest}>
     <path d="M12 5v14m0 0 4-4m-4 4-4-4" />
   </svg>
 )
 
-const ArrowLeft = ({ direction, ...rest }: SvgType) => <ArrowDown direction="left" {...rest} />
-const ArrowRight = ({ direction, ...rest }: SvgType) => <ArrowDown direction="right" {...rest} />
-const ArrowTop = ({ direction, ...rest }: SvgType) => <ArrowDown direction="top" {...rest} />
-
-export { ArrowDown, ArrowLeft, ArrowRight, ArrowTop }
+export default ArrowDown

packages/pillar-icons/src/icons/arrows/arrowLeft.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowDown from './arrowDown'
+
+const ArrowLeft = ({ direction, ...rest }: SvgType) => <ArrowDown direction="left" {...rest} />
+
+export default ArrowLeft

packages/pillar-icons/src/icons/arrows/arrowRight.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowDown from './arrowDown'
+
+const ArrowRight = ({ direction, ...rest }: SvgType) => <ArrowDown direction="right" {...rest} />
+
+export default ArrowRight

packages/pillar-icons/src/icons/arrows/arrowTop.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowDown from './arrowDown'
+
+const ArrowTop = ({ direction, ...rest }: SvgType) => <ArrowDown direction="top" {...rest} />
+
+export default ArrowTop

packages/pillar-icons/src/icons/arrows/arrowsDoubleDown.tsx

@@ -0,0 +1,10 @@
+import { ROTATION, svgProps } from '../../shared'
+import { SvgWithDirection } from '../../type'
+
+const ArrowsDoubleDown = ({ direction = 'bottom', ...rest }: SvgWithDirection) => (
+  <svg {...svgProps} transform={`rotate(${ROTATION[direction]})`} {...rest}>
+    <path d="M17 3v18m0-18 3 3m-3-3-3 3m-4 12-3 3m0 0-3-3m3 3V3" />
+  </svg>
+)
+
+export default ArrowsDoubleDown

packages/pillar-icons/src/icons/arrows/arrowsDoubleLeft.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowsDoubleDown from './arrowsDoubleDown'
+
+const ArrowDownLeft = ({ direction, ...rest }: SvgType) => <ArrowsDoubleDown direction="left" {...rest} />
+
+export default ArrowDownLeft

packages/pillar-icons/src/icons/arrows/arrowsDoubleRight.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowsDoubleDown from './arrowsDoubleDown'
+
+const ArrowDownRight = ({ direction, ...rest }: SvgType) => <ArrowsDoubleDown direction="right" {...rest} />
+
+export default ArrowDownRight

packages/pillar-icons/src/icons/arrows/arrowsDoubleTop.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowsDoubleDown from './arrowsDoubleDown'
+
+const ArrowDownTop = ({ direction, ...rest }: SvgType) => <ArrowsDoubleDown direction="top" {...rest} />
+
+export default ArrowDownTop

packages/pillar-icons/src/icons/arrows/arrowsDown.tsx

@@ -1,14 +1,10 @@
 import { ROTATION, svgProps } from '../../shared'
-import { SvgType, SvgWithDirection } from '../../type'
+import { SvgWithDirection } from '../../type'
 
 const ArrowsDown = ({ direction = 'bottom', ...rest }: SvgWithDirection) => (
   <svg {...svgProps} transform={`rotate(${ROTATION[direction]})`} {...rest}>
     <path d="M7 21V3m0 18-3-3m3 3 3-3m10 0-3 3m0 0-3-3m3 3V3" />
   </svg>
 )
 
-const ArrowsLeft = ({ direction, ...rest }: SvgType) => <ArrowsDown direction="left" {...rest} />
-const ArrowsRight = ({ direction, ...rest }: SvgType) => <ArrowsDown direction="right" {...rest} />
-const ArrowsTop = ({ direction, ...rest }: SvgType) => <ArrowsDown direction="top" {...rest} />
-
-export { ArrowsDown, ArrowsLeft, ArrowsRight, ArrowsTop }
+export default ArrowsDown

packages/pillar-icons/src/icons/arrows/arrowsLeft.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowsDown from './arrowsDown'
+
+const ArrowsLeft = ({ direction, ...rest }: SvgType) => <ArrowsDown direction="left" {...rest} />
+
+export default ArrowsLeft

packages/pillar-icons/src/icons/arrows/arrowsRight.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowsDown from './arrowsDown'
+
+const ArrowsRight = ({ direction, ...rest }: SvgType) => <ArrowsDown direction="right" {...rest} />
+
+export default ArrowsRight

packages/pillar-icons/src/icons/arrows/arrowsTop.tsx

@@ -0,0 +1,6 @@
+import { SvgType } from '../../type'
+import ArrowsDown from './arrowsDown'
+
+const ArrowsTop = ({ direction, ...rest }: SvgType) => <ArrowsDown direction="top" {...rest} />
+
+export default ArrowsTop