remoraid 2.10.7 → 2.14.7

package/dist/core/index.js

@@ -977,7 +977,7 @@ var require_lodash = __commonJS((exports, module) => {
       }
       SetCache.prototype.add = SetCache.prototype.push = setCacheAdd;
       SetCache.prototype.has = setCacheHas;
-      function Stack3(entries) {
+      function Stack4(entries) {
         var data = this.__data__ = new ListCache(entries);
         this.size = data.size;
       }
@@ -1011,11 +1011,11 @@ var require_lodash = __commonJS((exports, module) => {
         this.size = data.size;
         return this;
       }
-      Stack3.prototype.clear = stackClear;
-      Stack3.prototype["delete"] = stackDelete;
-      Stack3.prototype.get = stackGet;
-      Stack3.prototype.has = stackHas;
-      Stack3.prototype.set = stackSet;
+      Stack4.prototype.clear = stackClear;
+      Stack4.prototype["delete"] = stackDelete;
+      Stack4.prototype.get = stackGet;
+      Stack4.prototype.has = stackHas;
+      Stack4.prototype.set = stackSet;
       function arrayLikeKeys(value, inherited) {
         var isArr = isArray(value), isArg = !isArr && isArguments(value), isBuff = !isArr && !isArg && isBuffer(value), isType = !isArr && !isArg && !isBuff && isTypedArray(value), skipIndexes = isArr || isArg || isBuff || isType, result2 = skipIndexes ? baseTimes(value.length, String) : [], length = result2.length;
         for (var key in value) {
@@ -1131,7 +1131,7 @@ var require_lodash = __commonJS((exports, module) => {
             result2 = initCloneByTag(value, tag, isDeep);
           }
         }
-        stack || (stack = new Stack3);
+        stack || (stack = new Stack4);
         var stacked = stack.get(value);
         if (stacked) {
           return stacked;
@@ -1400,21 +1400,21 @@ var require_lodash = __commonJS((exports, module) => {
           objIsObj = false;
         }
         if (isSameTag && !objIsObj) {
-          stack || (stack = new Stack3);
+          stack || (stack = new Stack4);
           return objIsArr || isTypedArray(object) ? equalArrays(object, other, bitmask, customizer, equalFunc, stack) : equalByTag(object, other, objTag, bitmask, customizer, equalFunc, stack);
         }
         if (!(bitmask & COMPARE_PARTIAL_FLAG)) {
           var objIsWrapped = objIsObj && hasOwnProperty.call(object, "__wrapped__"), othIsWrapped = othIsObj && hasOwnProperty.call(other, "__wrapped__");
           if (objIsWrapped || othIsWrapped) {
             var objUnwrapped = objIsWrapped ? object.value() : object, othUnwrapped = othIsWrapped ? other.value() : other;
-            stack || (stack = new Stack3);
+            stack || (stack = new Stack4);
             return equalFunc(objUnwrapped, othUnwrapped, bitmask, customizer, stack);
           }
         }
         if (!isSameTag) {
           return false;
         }
-        stack || (stack = new Stack3);
+        stack || (stack = new Stack4);
         return equalObjects(object, other, bitmask, customizer, equalFunc, stack);
       }
       function baseIsMap(value) {
@@ -1440,7 +1440,7 @@ var require_lodash = __commonJS((exports, module) => {
               return false;
             }
           } else {
-            var stack = new Stack3;
+            var stack = new Stack4;
             if (customizer) {
               var result2 = customizer(objValue, srcValue, key, object, source, stack);
             }
@@ -1536,7 +1536,7 @@ var require_lodash = __commonJS((exports, module) => {
           return;
         }
         baseFor(source, function(srcValue, key) {
-          stack || (stack = new Stack3);
+          stack || (stack = new Stack4);
           if (isObject(srcValue)) {
             baseMergeDeep(object, source, key, srcIndex, baseMerge, customizer, stack);
           } else {
@@ -5618,7 +5618,43 @@ var FrameLayoutVariant;
 })(FrameLayoutVariant ||= {});
 
 // src/core/lib/utils.ts
+import {
+  isValidElement
+} from "react";
 var co = (condition, value, fallback) => condition(value) ? value : fallback;
+var isValidElementOfType = (type, value) => {
+  return isValidElement(value) && value.type === type;
+};
+var getElementTypeName = (type) => {
+  if (typeof type === "string") {
+    return type;
+  }
+  if (typeof type === "function") {
+    return type.displayName ?? type.name ?? "anonymous component";
+  }
+  return "unknown";
+};
+var asElementOfType = (type, element, additionalErrorMessage) => {
+  if (isValidElementOfType(type, element)) {
+    return element;
+  }
+  throw new TypeError(`Expected React element of type ${getElementTypeName(type)}, but received type: ${getElementTypeName(element.type)}.${additionalErrorMessage !== undefined && additionalErrorMessage.length > 0 ? ` ${additionalErrorMessage}` : ""}`);
+};
+var asChildrenOfType = (type, children, additionalErrorMessage) => {
+  if (children === undefined || children === null) {
+    return children;
+  }
+  if (Array.isArray(children)) {
+    return children.map((child) => asChildrenOfType(type, child, additionalErrorMessage));
+  }
+  return asElementOfType(type, children, additionalErrorMessage);
+};
+var asElementOrPropsOfType = (type, elementOrProps, additionalErrorMessage) => {
+  if (isValidElement(elementOrProps)) {
+    return asElementOfType(type, elementOrProps, additionalErrorMessage);
+  }
+  return elementOrProps;
+};
 
 // src/core/components/RemoraidProvider/ThemeProvider/index.tsx
 import {
@@ -5820,10 +5856,10 @@ function UserExperienceProviderWrapper({
   initialValue
 }) {
   const [cookies, setCookie] = useCookies();
-  const initialUserExperience = {
-    ...defaultUserExperience,
-    ...initialValue
-  };
+  let initialUserExperience = defaultUserExperience;
+  if (typeof initialValue === "object" && typeof initialUserExperience === "object") {
+    initialUserExperience = { ...initialUserExperience, ...initialValue };
+  }
   const [userExperience, setUserExperience] = useState3(initialUserExperience);
   const [processedCookie, setProcessedCookie] = useState3(false);
   const updateUserExperience = (p) => {
@@ -6375,23 +6411,27 @@ var FrameLayout_default = Object.assign(FrameLayout, {
 // src/core/components/AppShell/index.tsx
 import { jsxDEV as jsxDEV13, Fragment as Fragment2 } from "react/jsx-dev-runtime";
 var defaultAppShellLayoutId = "remoraidAppShell";
-var defaultProps = {
-  navbarVariant: null,
-  footerVariant: null
-};
+var defaultAppShellNavbarPositions = { ["minimal" /* Minimal */]: "left" /* Left */ };
+var defaultAppShellFooterPositions = { ["minimal" /* Minimal */]: "content" /* Content */ };
 function AppShell(props) {
   const {
     children,
     navbarVariant,
     footerVariant,
-    navbarPosition,
-    footerPosition,
     appContext: appContext2,
     componentsProps
   } = {
-    ...defaultProps,
+    navbarVariant: null,
+    footerVariant: null,
     ...props
   };
+  let { navbarPosition, footerPosition } = props;
+  if (navbarVariant !== null && navbarPosition === undefined) {
+    navbarPosition = defaultAppShellNavbarPositions[navbarVariant];
+  }
+  if (footerVariant !== null && footerPosition === undefined) {
+    footerPosition = defaultAppShellFooterPositions[footerVariant];
+  }
   let navbar;
   let footer;
   let navbarContainerProps = {};
@@ -6415,32 +6455,50 @@ function AppShell(props) {
   return /* @__PURE__ */ jsxDEV13(AppProvider, {
     appContext: appContext2,
     ...componentsProps?.AppProvider,
-    children: /* @__PURE__ */ jsxDEV13(FrameLayout_default, {
-      layoutId: defaultAppShellLayoutId,
-      ...componentsProps?.layout,
-      children: [
-        navbarPosition !== undefined && navbarPosition !== "content" /* Content */ && /* @__PURE__ */ jsxDEV13(FrameLayout_default.Element, {
-          section: navbarPosition,
-          componentsProps: { container: { ...navbarContainerProps } },
-          children: navbar
-        }, undefined, false, undefined, this),
-        footerPosition !== undefined && footerPosition !== "content" /* Content */ && /* @__PURE__ */ jsxDEV13(FrameLayout_default.Element, {
-          section: footerPosition,
-          componentsProps: { container: { ...footerContainerProps } },
-          children: footer
-        }, undefined, false, undefined, this),
-        navbarPosition !== undefined && navbarPosition === "content" /* Content */ && /* @__PURE__ */ jsxDEV13(Fragment2, {
-          children: navbar
-        }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsxDEV13(Box3, {
-          ...componentsProps?.childrenContainer,
-          children
-        }, undefined, false, undefined, this),
-        footerPosition !== undefined && footerPosition === "content" /* Content */ && /* @__PURE__ */ jsxDEV13(Fragment2, {
-          children: footer
-        }, undefined, false, undefined, this)
-      ]
-    }, undefined, true, undefined, this)
+    children: /* @__PURE__ */ jsxDEV13(Box3, {
+      h: "100vh",
+      ...componentsProps?.container,
+      children: /* @__PURE__ */ jsxDEV13(FrameLayout_default, {
+        layoutId: defaultAppShellLayoutId,
+        ...componentsProps?.layout,
+        children: [
+          navbarPosition !== undefined && navbarPosition !== "content" /* Content */ && /* @__PURE__ */ jsxDEV13(FrameLayout_default.Element, {
+            section: navbarPosition,
+            ...componentsProps?.navbarLayoutElement,
+            componentsProps: {
+              ...componentsProps?.navbarLayoutElement?.componentsProps,
+              container: {
+                ...navbarContainerProps,
+                ...componentsProps?.navbarLayoutElement?.componentsProps?.container
+              }
+            },
+            children: navbar
+          }, undefined, false, undefined, this),
+          footerPosition !== undefined && footerPosition !== "content" /* Content */ && /* @__PURE__ */ jsxDEV13(FrameLayout_default.Element, {
+            section: footerPosition,
+            ...componentsProps?.footerLayoutElement,
+            componentsProps: {
+              ...componentsProps?.footerLayoutElement?.componentsProps,
+              container: {
+                ...footerContainerProps,
+                ...componentsProps?.footerLayoutElement?.componentsProps?.container
+              }
+            },
+            children: footer
+          }, undefined, false, undefined, this),
+          navbarPosition !== undefined && navbarPosition === "content" /* Content */ && /* @__PURE__ */ jsxDEV13(Fragment2, {
+            children: navbar
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV13(Box3, {
+            ...componentsProps?.childrenContainer,
+            children
+          }, undefined, false, undefined, this),
+          footerPosition !== undefined && footerPosition === "content" /* Content */ && /* @__PURE__ */ jsxDEV13(Fragment2, {
+            children: footer
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this)
+    }, undefined, false, undefined, this)
   }, undefined, false, undefined, this);
 }
 var AppShell_default = Object.assign(AppShell, {
@@ -6630,7 +6688,7 @@ import {
   Group as Group3,
   Tooltip as Tooltip3
 } from "@mantine/core";
-import React7 from "react";
+import React7, { isValidElement as isValidElement2 } from "react";
 
 // src/core/components/BadgeMinimal/index.tsx
 import {
@@ -6639,15 +6697,6 @@ import {
   Transition as Transition2
 } from "@mantine/core";
 import { jsxDEV as jsxDEV19 } from "react/jsx-dev-runtime";
-var isBadgeMinimalProps = (e) => {
-  if (typeof e !== "object") {
-    return false;
-  }
-  if (!("label" in e)) {
-    return false;
-  }
-  return true;
-};
 function BadgeMinimal(props) {
   const { label, tooltip, mounted, componentsProps } = props;
   const theme = useRemoraidTheme();
@@ -6679,27 +6728,30 @@ function BadgeMinimal(props) {
 import { jsxDEV as jsxDEV20, Fragment as Fragment3 } from "react/jsx-dev-runtime";
 import { createElement } from "react";
 function BadgeGroup({
-  badges,
+  badges: badgesProp,
   gap,
   breakpoint,
   componentsProps
 }) {
   const theme = useRemoraidTheme();
-  const numVisibleBadges = badges.filter((e) => isBadgeMinimalProps(e) ? e.mounted !== false : true).length;
+  const badges = badgesProp.map((badge) => asElementOrPropsOfType(BadgeMinimal, badge, "Check 'badges' property passed to 'BadgeGroup'."));
+  const numVisibleBadges = badges.filter((badge) => isValidElementOfType(BadgeMinimal, badge) ? badge.props.mounted : badge.mounted !== false).length;
   return /* @__PURE__ */ jsxDEV20(Fragment3, {
     children: [
       /* @__PURE__ */ jsxDEV20(Group3, {
         gap: gap ?? "xs",
         wrap: "nowrap",
         visibleFrom: breakpoint ?? theme.breakpoints.badgeGroupCollapse,
-        children: badges.map((e, i) => {
-          if (isBadgeMinimalProps(e)) {
-            return /* @__PURE__ */ createElement(BadgeMinimal, {
-              ...e,
-              key: i
-            });
-          }
-          return e;
+        children: badges.map((badge, i) => {
+          if (isValidElementOfType(BadgeMinimal, badge)) {
+            return badge;
+          } else if (isValidElement2(badge)) {
+            throw new TypeError(`Expected React element of type ${BadgeMinimal.name}, but received type: ${typeof badge.type === "string" ? badge.type : badge.type?.name ?? "unknown"}. Check the 'badges' property of this widget.`);
+          }
+          return /* @__PURE__ */ createElement(BadgeMinimal, {
+            ...badge,
+            key: i
+          });
         })
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsxDEV20(Tooltip3, {
@@ -6724,17 +6776,7 @@ import {
   Transition as Transition3
 } from "@mantine/core";
 import { jsxDEV as jsxDEV21 } from "react/jsx-dev-runtime";
-var isAlertMinimalProps = (e) => {
-  if (typeof e !== "object") {
-    return false;
-  }
-  if (!("category" in e)) {
-    return false;
-  }
-  return true;
-};
 function AlertMinimal({
-  children,
   title,
   category,
   text,
@@ -6742,7 +6784,8 @@ function AlertMinimal({
   mounted,
   mt,
   mb,
-  componentsProps
+  componentsProps,
+  children
 }) {
   const theme = useRemoraidTheme();
   return /* @__PURE__ */ jsxDEV21(Transition3, {
@@ -6778,15 +6821,6 @@ import {
 } from "@mantine/core";
 import { IconClick } from "@tabler/icons-react";
 import { jsxDEV as jsxDEV22, Fragment as Fragment4 } from "react/jsx-dev-runtime";
-var isRemoraidButtonProps = (e) => {
-  if (typeof e !== "object") {
-    return false;
-  }
-  if (!("label" in e)) {
-    return false;
-  }
-  return true;
-};
 function RemoraidButton({
   label,
   responsive,
@@ -6912,7 +6946,8 @@ import {
   Divider as Divider3,
   Group as Group4,
   Loader,
-  Title
+  Title,
+  Stack as Stack3
 } from "@mantine/core";
 import { jsxDEV as jsxDEV24, Fragment as Fragment5 } from "react/jsx-dev-runtime";
 import { createElement as createElement2 } from "react";
@@ -6921,14 +6956,17 @@ function Widget({
   id,
   config,
   title,
-  badges,
-  buttons,
-  alerts,
+  badges: badgesProp,
+  buttons: buttonsProp,
+  alerts: alertsProp,
   gaps,
   loading,
   mt,
   componentsProps
 }) {
+  const buttons = buttonsProp?.map((button) => asElementOrPropsOfType(RemoraidButton, button, "Check the 'buttons' property of this widget."));
+  const alerts = alertsProp?.map((alert) => asElementOrPropsOfType(AlertMinimal, alert, "Check the 'alerts' property of this widget."));
+  const badges = badgesProp?.map((badge) => asElementOrPropsOfType(BadgeMinimal, badge, "Check the 'badges' property of this widget."));
   const badgesGap = (typeof gaps === "object" ? gaps.badges : gaps) ?? "xs";
   const buttonsGap = (typeof gaps === "object" ? gaps.buttons : gaps) ?? "xs";
   const alertsGap = (typeof gaps === "object" ? gaps.alerts : gaps) ?? "xs";
@@ -6969,31 +7007,37 @@ function Widget({
           /* @__PURE__ */ jsxDEV24(Group4, {
             gap: buttonsGap,
             wrap: "nowrap",
-            children: buttons !== undefined && buttons.map((e, i) => {
-              if (isRemoraidButtonProps(e)) {
-                return /* @__PURE__ */ createElement2(RemoraidButton, {
-                  ...e,
-                  key: i
-                });
+            children: buttons !== undefined && buttons.map((button, i) => {
+              if (isValidElementOfType(RemoraidButton, button)) {
+                return button;
               }
-              return e;
+              return /* @__PURE__ */ createElement2(RemoraidButton, {
+                ...button,
+                key: i
+              });
             })
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
       /* @__PURE__ */ jsxDEV24(Divider3, {
-        my: "md"
+        my: "md",
+        ...componentsProps?.divider
       }, undefined, false, undefined, this),
-      alerts !== undefined && alerts.map((a, i) => {
-        if (isAlertMinimalProps(a)) {
+      /* @__PURE__ */ jsxDEV24(Stack3, {
+        align: "stretch",
+        gap: alertsGap,
+        mb: alerts && alerts.length > 0 ? "md" : 0,
+        ...componentsProps?.alertsContainer,
+        children: alerts?.map((alert, i) => {
+          if (isValidElementOfType(AlertMinimal, alert)) {
+            return alert;
+          }
           return /* @__PURE__ */ createElement2(AlertMinimal, {
-            ...a,
-            mb: alertsGap,
+            ...alert,
             key: i
           });
-        }
-        return a;
-      }),
+        })
+      }, undefined, false, undefined, this),
       loading ? /* @__PURE__ */ jsxDEV24(Center, {
         children: /* @__PURE__ */ jsxDEV24(Loader, {
           ...componentsProps?.loader
@@ -7194,10 +7238,11 @@ var useSettingsTableOptions = () => {
   return useContext10(settingsTableOptionsContext);
 };
 function SettingsTable({
-  children,
-  leftColumnWidth
+  leftColumnWidth,
+  children: childrenProp
 }) {
   const theme = useRemoraidTheme();
+  const children = asChildrenOfType(Row, childrenProp, "Check children passed to 'SettingsTable' component.");
   return /* @__PURE__ */ jsxDEV30(settingsTableOptionsContext.Provider, {
     value: {
       leftColumnWidth: leftColumnWidth ?? defaultSettingsTableOptions.leftColumnWidth
@@ -7217,7 +7262,6 @@ var SettingsTable_default = Object.assign(SettingsTable, {
   Row
 });
 // src/core/components/NavbarSettingsWidget/index.tsx
-import { cloneElement } from "react";
 var import_lodash = __toESM(require_lodash(), 1);
 import { Chip as Chip3, Group as Group6 } from "@mantine/core";
 import { IconLink as IconLink2 } from "@tabler/icons-react";
@@ -7245,6 +7289,7 @@ function NavbarSettingsWidget({
     },
     custom: !import_lodash.isEqual(userExperience.navbar, initialUserExperience.navbar),
     children: /* @__PURE__ */ jsxDEV31(SettingsTable_default, {
+      ...componentsProps?.table,
       children: [
         /* @__PURE__ */ jsxDEV31(SettingsTable_default.Row, {
           label: "Select which pages you want to display or hide",
@@ -7275,12 +7320,60 @@ function NavbarSettingsWidget({
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this)
         }, "select-hidden-pages", false, undefined, this),
-        ...(additionalRows ?? []).map((row, i) => row.key ? row : cloneElement(row, { key: i }))
-      ],
-      ...componentsProps?.table
-    }, undefined, false, undefined, this)
+        additionalRows && additionalRows.map((row, i) => {
+          if (isValidElementOfType(SettingsTable_default.Row, row)) {
+            return row;
+          }
+          return /* @__PURE__ */ jsxDEV31(SettingsTable_default.Row, {
+            ...row
+          }, i, false, undefined, this);
+        })
+      ]
+    }, undefined, true, undefined, this)
   }, undefined, false, undefined, this);
 }
+// src/core/components/ContextClusterProvider/index.tsx
+import React8 from "react";
+import { jsxDEV as jsxDEV32 } from "react/jsx-dev-runtime";
+var createContextCluster = (generalDefaultValue, staticIds) => {
+  const isStaticId = (id) => {
+    if (staticIds?.find((staticId) => staticId === id)) {
+      return true;
+    }
+    return false;
+  };
+  const contexts = {};
+  const defaultValues = {};
+  const createContext8 = (id, defaultValue) => {
+    const context = React8.createContext(defaultValue ?? generalDefaultValue);
+    contexts[id] = context;
+    defaultValues[id] = defaultValue ?? generalDefaultValue;
+    return context;
+  };
+  const useContext11 = (id) => {
+    if (isStaticId(id)) {
+      return contexts[id] ? React8.useContext(contexts[id]) : generalDefaultValue;
+    }
+    return contexts[id] ? React8.useContext(contexts[id]) : null;
+  };
+  return {
+    contexts,
+    defaultValues,
+    generalDefaultValue,
+    createContext: createContext8,
+    useContext: useContext11
+  };
+};
+function ContextClusterProvider({
+  cluster,
+  values = {},
+  children
+}) {
+  return Object.entries(cluster.contexts).reduceRight((t, [id, context]) => /* @__PURE__ */ jsxDEV32(context.Provider, {
+    value: values[id] ?? cluster.defaultValues[id] ?? cluster.generalDefaultValue,
+    children: t
+  }, undefined, false, undefined, this), children);
+}
 export {
   useWidgets,
   useSettingsWidgetContext as useSettingsWidgetOptions,
@@ -7293,7 +7386,9 @@ export {
   useHydrationStatus,
   useHydratedMantineColorScheme,
   useFrameLayout,
+  isValidElementOfType,
   isFrameLayout,
+  getElementTypeName,
   defaultUserExperienceCookieName,
   defaultUserExperience,
   defaultSettingsWidgetContext as defaultSettingsWidgetOptions,
@@ -7301,10 +7396,17 @@ export {
   defaultNavbarSettingsWidgetId,
   defaultLayoutsContext,
   defaultFrameLayoutContext,
+  defaultAppShellNavbarPositions,
   defaultAppShellLayoutId,
+  defaultAppShellFooterPositions,
   defaultAppContext,
   createUserExperienceContext,
   createRemoraidTheme,
+  createContextCluster,
+  co,
+  asElementOrPropsOfType,
+  asElementOfType,
+  asChildrenOfType,
   WidgetWrapper_default as WidgetWrapper,
   WidgetSelectionHeader,
   Widget,
@@ -7329,6 +7431,7 @@ export {
   FrameLayout_default as FrameLayout,
   FooterVariant,
   EnvironmentShell,
+  ContextClusterProvider,
   BadgeMinimal,
   BadgeGroup,
   AppShell_default as AppShell,

package/dist/server/index.d.ts

@@ -9,7 +9,7 @@ interface EnvironmentShellProps {
 		container?: ContainerProps3
 	};
 }
-import { PropsWithChildren as PropsWithChildren21, ReactNode as ReactNode33 } from "react";
+import { PropsWithChildren as PropsWithChildren22, ReactNode as ReactNode34 } from "react";
 interface ServerEnvironmentShellProps extends EnvironmentShellProps {}
-declare function EnvironmentShell2({ children, environment, message }: PropsWithChildren21<ServerEnvironmentShellProps>): ReactNode33;
+declare function EnvironmentShell2({ children, environment, message }: PropsWithChildren22<ServerEnvironmentShellProps>): ReactNode34;
 export { ServerEnvironmentShellProps, EnvironmentShell2 as EnvironmentShell };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remoraid",
-  "version": "2.10.7",
+  "version": "2.14.7",
   "author": "Konrad Goldammer",
   "repository": {
     "type": "git",