@comet/admin 9.0.0-beta.4 → 9.0.0-beta.5

package/lib/tabs/__stories__/RouterTabsInStack.stories.js

@@ -0,0 +1,74 @@
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+import { RouterTab, RouterTabs, Stack, StackPage, StackSwitch } from "@comet/admin";
+import { useEffect, useRef, useState } from "react";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+var mountCount = {};
+function RenderCount(props) {
+  useEffect(function () {
+    mountCount[props.name] = (mountCount[props.name] || 0) + 1;
+  }, [props.name]);
+  var renderCount = useRef(0);
+  renderCount.current++;
+  return /*#__PURE__*/_jsxs("div", {
+    children: ["Render count ", props.name, ": ", renderCount.current]
+  });
+}
+function PrintMountCount() {
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    rerender = _useState2[1];
+  useEffect(function () {
+    var timer = setInterval(function () {
+      rerender(new Date().getTime());
+    }, 100);
+    return function () {
+      return clearInterval(timer);
+    };
+  }, []);
+  return /*#__PURE__*/_jsxs("div", {
+    children: ["Mount count: ", JSON.stringify(mountCount)]
+  });
+}
+export default {
+  title: "components/tabs/RouterTabs in Stack"
+};
+export var RouterTabsInStack = {
+  render: function render() {
+    return /*#__PURE__*/_jsxs(Stack, {
+      topLevelTitle: "Nested Stack",
+      children: [/*#__PURE__*/_jsx(PrintMountCount, {}), /*#__PURE__*/_jsxs(StackSwitch, {
+        children: [/*#__PURE__*/_jsxs(StackPage, {
+          name: "xxx",
+          children: [/*#__PURE__*/_jsx(RenderCount, {
+            name: "StackPage"
+          }), /*#__PURE__*/_jsxs(RouterTabs, {
+            children: [/*#__PURE__*/_jsxs(RouterTab, {
+              label: "Foo",
+              path: "",
+              forceRender: true,
+              children: ["Foo", /*#__PURE__*/_jsx(RenderCount, {
+                name: "Foo"
+              })]
+            }), /*#__PURE__*/_jsxs(RouterTab, {
+              label: "Bar",
+              path: "/bar",
+              forceRender: true,
+              children: ["Bar", /*#__PURE__*/_jsx(RenderCount, {
+                name: "Bar"
+              })]
+            })]
+          })]
+        }), /*#__PURE__*/_jsx(StackPage, {
+          name: "yyy",
+          children: "yyy"
+        })]
+      })]
+    });
+  },
+  name: "RouterTabs in Stack"
+};

package/lib/tabs/__stories__/RouterTabsInSubroute.stories.js

@@ -0,0 +1,68 @@
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+import { RouterTab, RouterTabs, SubRoute } from "@comet/admin";
+import { useEffect, useState } from "react";
+import { Redirect, Route, Switch, useLocation, useRouteMatch } from "react-router";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+function Story() {
+  var match = useRouteMatch();
+  return /*#__PURE__*/_jsx("div", {
+    children: /*#__PURE__*/_jsx(SubRoute, {
+      path: "".concat(match.url, "/cmp1"),
+      children: /*#__PURE__*/_jsxs(RouterTabs, {
+        children: [/*#__PURE__*/_jsx(RouterTab, {
+          label: "Tab 1",
+          path: "",
+          children: "Tab 1 Content"
+        }), /*#__PURE__*/_jsx(RouterTab, {
+          label: "Tab 2",
+          path: "/form2",
+          children: "Tab 2 Content"
+        })]
+      })
+    })
+  });
+}
+function Path() {
+  var location = useLocation();
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    rerender = _useState2[1];
+  useEffect(function () {
+    var timer = setTimeout(function () {
+      rerender(new Date().getTime());
+    }, 1000);
+    return function () {
+      return clearTimeout(timer);
+    };
+  }, []);
+  return /*#__PURE__*/_jsx("div", {
+    children: location.pathname
+  });
+}
+export default {
+  title: "components/tabs/RouterTabs in SubRoute"
+};
+export var RouterTabsInSubRoute = {
+  render: function render() {
+    return /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsx(Path, {}), /*#__PURE__*/_jsxs(Switch, {
+        children: [/*#__PURE__*/_jsx(Route, {
+          exact: true,
+          path: "/",
+          children: /*#__PURE__*/_jsx(Redirect, {
+            to: "/foo"
+          })
+        }), /*#__PURE__*/_jsx(Route, {
+          path: "/foo",
+          children: /*#__PURE__*/_jsx(Story, {})
+        })]
+      })]
+    });
+  },
+  name: "Router Tabs in SubRoute"
+};

package/lib/tabs/__stories__/Tabs.stories.js

@@ -0,0 +1,219 @@
+var _excluded = ["pristine", "dirty", "hasValidationErrors", "submitting", "hasSubmitErrors", "handleSubmit"],
+  _excluded2 = ["pristine", "dirty", "hasValidationErrors", "submitting", "hasSubmitErrors", "handleSubmit"];
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
+import { Field, FillSpace, FinalForm, FinalFormInput, FinalFormSaveButton, Tab, Tabs, Toolbar, ToolbarActions, ToolbarBackButton } from "@comet/admin";
+import { Card, CardContent } from "@mui/material";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+export default {
+  title: "components/tabs/Tabs"
+};
+export var Basic = function Basic() {
+  return /*#__PURE__*/_jsxs(Tabs, {
+    children: [/*#__PURE__*/_jsx(Tab, {
+      label: "Label One",
+      children: "Content One"
+    }), /*#__PURE__*/_jsx(Tab, {
+      label: "Label Two",
+      children: "Content Two"
+    }), /*#__PURE__*/_jsx(Tab, {
+      label: "Label Three",
+      children: "Content Three"
+    })]
+  });
+};
+export var TabsInFormWithForceRender = {
+  render: function render() {
+    return /*#__PURE__*/_jsx("div", {
+      children: /*#__PURE__*/_jsx(FinalForm, {
+        mode: "edit",
+        onSubmit: function onSubmit(values) {
+          alert(JSON.stringify(values));
+        },
+        initialValues: {
+          foo: "foo",
+          bar: "bar"
+        },
+        children: function children(_ref) {
+          var pristine = _ref.pristine,
+            dirty = _ref.dirty,
+            hasValidationErrors = _ref.hasValidationErrors,
+            submitting = _ref.submitting,
+            hasSubmitErrors = _ref.hasSubmitErrors,
+            handleSubmit = _ref.handleSubmit,
+            formVars = _objectWithoutProperties(_ref, _excluded);
+          return /*#__PURE__*/_jsxs(_Fragment, {
+            children: ["Pristine: ", String(pristine), " ", /*#__PURE__*/_jsx("br", {}), "Dirty: ", String(dirty), /*#__PURE__*/_jsxs(Toolbar, {
+              children: [/*#__PURE__*/_jsx(ToolbarBackButton, {}), /*#__PURE__*/_jsx(FillSpace, {}), /*#__PURE__*/_jsx(ToolbarActions, {
+                children: /*#__PURE__*/_jsx(FinalFormSaveButton, {})
+              })]
+            }), /*#__PURE__*/_jsxs(Tabs, {
+              children: [/*#__PURE__*/_jsx(Tab, {
+                label: "Tab 1",
+                forceRender: true,
+                children: /*#__PURE__*/_jsx(Card, {
+                  variant: "outlined",
+                  children: /*#__PURE__*/_jsx(CardContent, {
+                    children: /*#__PURE__*/_jsx(Field, {
+                      label: "Foo",
+                      name: "foo",
+                      component: FinalFormInput
+                    })
+                  })
+                })
+              }), /*#__PURE__*/_jsx(Tab, {
+                label: "Tab 2",
+                forceRender: true,
+                children: /*#__PURE__*/_jsx(Card, {
+                  variant: "outlined",
+                  children: /*#__PURE__*/_jsx(CardContent, {
+                    children: /*#__PURE__*/_jsx(Field, {
+                      label: "Bar",
+                      name: "bar",
+                      component: FinalFormInput
+                    })
+                  })
+                })
+              })]
+            })]
+          });
+        }
+      })
+    });
+  },
+  name: "Tabs in Form with forceRender"
+};
+export var TabsInFormWithoutForceRender = {
+  render: function render() {
+    // !!!!!!!! Note: This example is how NOT to do it !!!!!!!!
+    return /*#__PURE__*/_jsx("div", {
+      children: /*#__PURE__*/_jsx(FinalForm, {
+        mode: "edit",
+        onSubmit: function onSubmit(values) {
+          alert(JSON.stringify(values));
+        },
+        initialValues: {
+          foo: "foo",
+          bar: "bar"
+        },
+        children: function children(_ref2) {
+          var pristine = _ref2.pristine,
+            dirty = _ref2.dirty,
+            hasValidationErrors = _ref2.hasValidationErrors,
+            submitting = _ref2.submitting,
+            hasSubmitErrors = _ref2.hasSubmitErrors,
+            handleSubmit = _ref2.handleSubmit,
+            formVars = _objectWithoutProperties(_ref2, _excluded2);
+          return /*#__PURE__*/_jsxs(_Fragment, {
+            children: ["Pristine: ", String(pristine), " ", /*#__PURE__*/_jsx("br", {}), "Dirty: ", String(dirty), /*#__PURE__*/_jsxs(Toolbar, {
+              children: [/*#__PURE__*/_jsx(ToolbarBackButton, {}), /*#__PURE__*/_jsx(FillSpace, {}), /*#__PURE__*/_jsx(ToolbarActions, {
+                children: /*#__PURE__*/_jsx(FinalFormSaveButton, {})
+              })]
+            }), /*#__PURE__*/_jsxs(Tabs, {
+              children: [/*#__PURE__*/_jsx(Tab, {
+                label: "Tab 1",
+                children: /*#__PURE__*/_jsx(Card, {
+                  variant: "outlined",
+                  children: /*#__PURE__*/_jsx(CardContent, {
+                    children: /*#__PURE__*/_jsx(Field, {
+                      label: "Foo",
+                      name: "foo",
+                      component: FinalFormInput
+                    })
+                  })
+                })
+              }), /*#__PURE__*/_jsx(Tab, {
+                label: "Tab 2",
+                children: /*#__PURE__*/_jsx(Card, {
+                  variant: "outlined",
+                  children: /*#__PURE__*/_jsx(CardContent, {
+                    children: /*#__PURE__*/_jsx(Field, {
+                      label: "Bar",
+                      name: "bar",
+                      component: FinalFormInput
+                    })
+                  })
+                })
+              })]
+            })]
+          });
+        }
+      })
+    });
+  },
+  name: "Tabs in Form without forceRender"
+};
+export var FormInTabsWithForceRender = {
+  render: function render() {
+    return /*#__PURE__*/_jsx("div", {
+      children: /*#__PURE__*/_jsxs(Tabs, {
+        children: [/*#__PURE__*/_jsx(Tab, {
+          label: "Form",
+          forceRender: true,
+          children: /*#__PURE__*/_jsx(Card, {
+            variant: "outlined",
+            children: /*#__PURE__*/_jsx(CardContent, {
+              children: /*#__PURE__*/_jsx(FinalForm, {
+                mode: "add",
+                onSubmit: function onSubmit(values) {
+                  alert(JSON.stringify(values));
+                },
+                children: /*#__PURE__*/_jsx(Field, {
+                  label: "Name",
+                  name: "name",
+                  component: FinalFormInput
+                })
+              })
+            })
+          })
+        }), /*#__PURE__*/_jsx(Tab, {
+          label: "Tab 2",
+          children: /*#__PURE__*/_jsx(Card, {
+            variant: "outlined",
+            children: /*#__PURE__*/_jsx(CardContent, {
+              children: "Tab 2"
+            })
+          })
+        })]
+      })
+    });
+  },
+  name: "Form in Tabs with forceRender"
+};
+export var FormInTabsWithoutForceRender = {
+  render: function render() {
+    // !!!!!!!! Note: This example is how NOT to do it !!!!!!!!
+    return /*#__PURE__*/_jsx("div", {
+      children: /*#__PURE__*/_jsxs(Tabs, {
+        children: [/*#__PURE__*/_jsx(Tab, {
+          label: "Form",
+          children: /*#__PURE__*/_jsx(Card, {
+            variant: "outlined",
+            children: /*#__PURE__*/_jsx(CardContent, {
+              children: /*#__PURE__*/_jsx(FinalForm, {
+                mode: "add",
+                onSubmit: function onSubmit(values) {
+                  alert(JSON.stringify(values));
+                },
+                children: /*#__PURE__*/_jsx(Field, {
+                  label: "Name",
+                  name: "name",
+                  component: FinalFormInput
+                })
+              })
+            })
+          })
+        }), /*#__PURE__*/_jsx(Tab, {
+          label: "Tab 2",
+          children: /*#__PURE__*/_jsx(Card, {
+            variant: "outlined",
+            children: /*#__PURE__*/_jsx(CardContent, {
+              children: "Tab 2"
+            })
+          })
+        })]
+      })
+    });
+  },
+  name: "Form in Tabs without forceRender"
+};

package/lib/theme/componentsTheme/MuiDataGrid.js

@@ -227,7 +227,7 @@ export var getMuiDataGrid = function getMuiDataGrid(component, _ref) {
         paddingBottom: spacing(2),
         marginBottom: spacing(2),
         borderBottomColor: palette.grey[50]
-      })), "&:first-child .".concat(gridClasses.filterFormLogicOperatorInput), {
+      })), "&:first-of-type .".concat(gridClasses.filterFormLogicOperatorInput), {
         // The first "Operator"-select is fully hidden by default when there is only one filter.
         // Setting `display: block` makes sure it takes up it's space as if it were visible to prevent the alignment from breaking.
         // Even though `display: block` is set now, it's still not visible, due to it's default styling of `visibility: hidden`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/admin",
-  "version": "9.0.0-beta.4",
+  "version": "9.0.0-beta.5",
   "description": "Comet Admin package",
   "repository": {
     "directory": "packages/admin/admin",
@@ -21,7 +21,7 @@
   ],
   "dependencies": {
     "@mui/utils": "^7.3.11",
-    "date-fns": "^4.1.0",
+    "date-fns": "^4.2.1",
     "exceljs": "^4.4.0",
     "final-form-set-field-data": "^1.0.2",
     "http-status-codes": "^2.3.0",
@@ -32,7 +32,7 @@
     "react-dropzone": "^14.3.8",
     "use-constant": "^2.0.0",
     "uuid": "^11.1.1",
-    "@comet/admin-icons": "9.0.0-beta.4"
+    "@comet/admin-icons": "9.0.0-beta.5"
   },
   "devDependencies": {
     "@apollo/client": "^3.14.1",
@@ -42,11 +42,11 @@
     "@emotion/styled": "^11.14.1",
     "@mui/material": "^7.3.11",
     "@mui/system": "^7.3.11",
-    "@mui/x-data-grid": "^8.28.6",
-    "@mui/x-data-grid-premium": "^8.28.6",
-    "@mui/x-data-grid-pro": "^8.28.6",
-    "@mui/x-date-pickers": "^8.28.5",
-    "@mui/x-date-pickers-pro": "^8.28.5",
+    "@mui/x-data-grid": "^8.28.7",
+    "@mui/x-data-grid-premium": "^8.28.7",
+    "@mui/x-data-grid-pro": "^8.28.7",
+    "@mui/x-date-pickers": "^8.28.7",
+    "@mui/x-date-pickers-pro": "^8.28.7",
     "@storybook/addon-docs": "^10.3.5",
     "@storybook/react-vite": "^10.3.5",
     "@testing-library/dom": "^10.4.1",
@@ -58,14 +58,14 @@
     "@types/lodash.debounce": "^4.0.9",
     "@types/lodash.isequal": "^4.5.8",
     "@types/node": "^24.12.4",
-    "@types/react": "^19.2.14",
+    "@types/react": "^19.2.15",
     "@types/react-dom": "^19.2.3",
     "@types/react-router": "^5.1.20",
     "@types/react-router-dom": "^5.3.3",
     "eslint": "^9.39.4",
     "eslint-plugin-storybook": "^10.3.5",
     "final-form": "^4.20.10",
-    "graphql": "^16.13.2",
+    "graphql": "^16.14.0",
     "history": "^4.10.1",
     "jsdom": "^28.1.0",
     "msw": "^2.10.4",
@@ -84,9 +84,9 @@
     "typescript": "^5.9.3",
     "vite-tsconfig-paths": "^6.0.4",
     "vitest": "^4.0.16",
-    "@comet/admin-babel-preset": "9.0.0-beta.4",
-    "@comet/eslint-config": "9.0.0-beta.4",
-    "@comet/eslint-plugin": "9.0.0-beta.4"
+    "@comet/admin-babel-preset": "9.0.0-beta.5",
+    "@comet/eslint-config": "9.0.0-beta.5",
+    "@comet/eslint-plugin": "9.0.0-beta.5"
   },
   "peerDependencies": {
     "@apollo/client": "^3.7.0",