fix: duplicate modal props

Atnic · Feb 26, 2024 · ce1d6b1 · ce1d6b1
1 parent a8e75e3
commit ce1d6b1
Show file tree

Hide file tree

Showing 12 changed files with 446 additions and 62 deletions.
diff --git a/packages/components/accordion/package.json b/packages/components/accordion/package.json
@@ -43,7 +43,7 @@
     "react": ">=18",
     "react-dom": ">=18",
     "framer-motion": ">=4.0.0",
-    "@jala-banyu/theme": ">=1.0.0",
+    "@jala-banyu/theme": "1.3.0",
     "@jala-banyu/system": ">=1.0.0"
   },
   "dependencies": {

diff --git a/packages/components/checkbox/package.json b/packages/components/checkbox/package.json
@@ -36,7 +36,7 @@
   "peerDependencies": {
     "react": ">=18",
     "react-dom": ">=18",
-    "@jala-banyu/theme": ">=1.0.0",
+    "@jala-banyu/theme": "1.3.0",
     "@jala-banyu/system": ">=1.0.0"
   },
   "dependencies": {

diff --git a/packages/components/chip/package.json b/packages/components/chip/package.json
@@ -36,7 +36,7 @@
   "peerDependencies": {
     "react": ">=18",
     "react-dom": ">=18",
-    "@jala-banyu/theme": ">=1.0.0",
+    "@jala-banyu/theme": "1.3.0",
     "@jala-banyu/system": ">=1.0.0"
   },
   "dependencies": {

diff --git a/packages/components/listbox/package.json b/packages/components/listbox/package.json
@@ -36,7 +36,7 @@
   "peerDependencies": {
     "react": ">=18",
     "react-dom": ">=18",
-    "@jala-banyu/theme": ">=1.0.0",
+    "@jala-banyu/theme": "1.3.0",
     "@jala-banyu/system": ">=1.0.0"
   },
   "dependencies": {

diff --git a/packages/components/modal/package.json b/packages/components/modal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jala-banyu/modal",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "description": "Displays a dialog with a custom content that requires attention or provides additional information.",
   "keywords": [
     "modal"

diff --git a/packages/components/scroll-shadow/package.json b/packages/components/scroll-shadow/package.json
@@ -36,7 +36,7 @@
   "peerDependencies": {
     "react": ">=18",
     "react-dom": ">=18",
-    "@jala-banyu/theme": ">=1.0.0",
+    "@jala-banyu/theme": "1.3.0",
     "@jala-banyu/system": ">=1.0.0"
   },
   "dependencies": {

diff --git a/packages/components/select/package.json b/packages/components/select/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jala-banyu/select",
-  "version": "1.1.0",
+  "version": "0.0.0",
   "description": "A select displays a collapsible list of options and allows a user to select one of them.",
   "keywords": [
     "select"
@@ -37,7 +37,7 @@
     "react": ">=18",
     "react-dom": ">=18",
     "framer-motion": ">=4.0.0",
-    "@jala-banyu/theme": ">=1.0.0",
+    "@jala-banyu/theme": "1.3.0",
     "@jala-banyu/system": ">=1.0.0"
   },
   "dependencies": {

diff --git a/packages/components/spacer/package.json b/packages/components/spacer/package.json
@@ -36,7 +36,7 @@
   "peerDependencies": {
     "react": ">=18",
     "react-dom": ">=18",
-    "@jala-banyu/theme": ">=1.0.0",
+    "@jala-banyu/theme": "1.3.0",
     "@jala-banyu/system": ">=1.0.0"
   },
   "dependencies": {

diff --git a/packages/core/theme/src/components/modal.ts b/packages/core/theme/src/components/modal.ts
@@ -157,12 +157,6 @@ const modal = tv({
         base: "my-16",
       },
     },
-    isDismissable: {
-      true: "",
-      false: {
-        closeButton: "hidden",
-      },
-    },
   },
   defaultVariants: {
     size: "sm",
@@ -171,6 +165,7 @@ const modal = tv({
     placement: "auto",
     backdrop: "opaque",
     scrollBehavior: "normal",
+    isDismissable: true,
   },
   compoundVariants: [
     // backdrop (opaque/blur)
@@ -180,6 +175,12 @@ const modal = tv({
         backdrop: "w-screen h-screen fixed inset-0",
       },
     },
+    {
+      isDismissable: false,
+      class: {
+        closeButton: "hidden",
+      },
+    },
   ],
 });
 

diff --git a/packages/storybook/package.json b/packages/storybook/package.json
@@ -12,13 +12,12 @@
     "@jala-banyu/react": "workspace: *",
     "@jala-banyu/system": "workspace: *",
     "@jala-banyu/theme": "workspace: *",
-    "@muhamien/jala-icons": "^2.0.2",
     "@storybook/addon-storysource": "^7.6.10",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@muhamien/jala-icons": "^2.0.2",
+    "@jala-banyu/icons": "^1.0.7",
     "@storybook/addon-a11y": "^7.4.6",
     "@storybook/addon-actions": "^7.4.6",
     "@storybook/addon-designs": "^7.0.9",
@@ -42,4 +41,4 @@
     "typescript": "^5.2.2",
     "vite": "^5.0.8"
   }
-}
+}
diff --git a/plop/component/package.json.hbs b/plop/component/package.json.hbs
@@ -36,8 +36,8 @@
   "peerDependencies": {
     "react": ">=18",
     "react-dom": ">=18"
-    "@jala-banyu/theme": ">=2.0.0",
-    "@jala-banyu/system": ">=2.0.0"
+    "@jala-banyu/theme": ">=1.3.0",
+    "@jala-banyu/system": ">=1.0.0"
   },
   "dependencies": {
     "@jala-banyu/shared-utils": "workspace: *",