@kbach/react 0.3.13 → 0.3.15

package/dist/{chunk-BBWDCPU6.mjs → chunk-6FOS3PUK.mjs}

@@ -8,7 +8,7 @@ import {
   resolve,
   useConditionalWidth,
   useGlobalDarkMode
-} from "./chunk-XL3F5GRY.mjs";
+} from "./chunk-OJE5MVCI.mjs";
 
 // src/jsx-runtime.tsx
 import { jsx as _jsx, jsxs as _jsxs, Fragment } from "react/jsx-runtime";
@@ -32,12 +32,24 @@ var DarkWrapper = React.forwardRef(
     const width = useConditionalWidth(needsWidth);
     const breakpoints = needsWidth ? getActiveBreakpoints(width) : EMPTY_BREAKPOINTS;
     const computedStyle = flatten(resolvedStyle, isDark, {}, breakpoints);
+    if (isWeb) stripWebGridProps(computedStyle);
     const finalStyle = styleProp ? Array.isArray(styleProp) ? Object.assign({}, computedStyle, ...styleProp) : { ...computedStyle, ...styleProp } : computedStyle;
     const props = { ref, ...rest, style: finalStyle };
     return Array.isArray(children) ? React.createElement(Component, props, ...children) : React.createElement(Component, props, children);
   }
 );
 DarkWrapper.displayName = "Kbach.DarkWrapper";
+function stripWebGridProps(s) {
+  if (s.display === "grid" || s.display === "inline-grid") delete s.display;
+  delete s.gridTemplateColumns;
+  delete s.gridTemplateRows;
+  delete s.gridColumn;
+  delete s.gridRow;
+  delete s.gridArea;
+  delete s.gridAutoFlow;
+  delete s.gridAutoColumns;
+  delete s.gridAutoRows;
+}
 
 // src/jsx-runtime.tsx
 var INTERACTIVE_MODS = /* @__PURE__ */ new Set([
@@ -115,12 +127,14 @@ function processElement(type, rawProps, key, isStaticChildren) {
     return makeElement(isStaticChildren, type, rawProps, key);
   }
   const config = getConfig();
+  const isGrdOnWeb = isWeb && classStr != null && /(?:^|\s)grd(?:\s|$)/.test(classStr);
+  const actualType = isGrdOnWeb ? "div" : type;
   const resolved = __kbachStyles ?? (classStr ? resolve(classStr, config.theme, config.darkMode) : {});
   const { style: userStyle, ...passProps } = omitConsumed(rawProps);
   const { interactive, modeOrResponsive } = bucketMods(resolved);
   if (interactive) {
     return _jsx(InteractiveWrapper, {
-      Component: type,
+      Component: actualType,
       resolvedStyle: resolved,
       ...isWeb && classStr ? { className: classStr } : {},
       style: userStyle,
@@ -129,7 +143,7 @@ function processElement(type, rawProps, key, isStaticChildren) {
   }
   if (modeOrResponsive) {
     return _jsx(DarkWrapper, {
-      Component: type,
+      Component: actualType,
       resolvedStyle: resolved,
       ...isWeb && classStr ? { className: classStr } : {},
       style: userStyle,
@@ -137,8 +151,19 @@ function processElement(type, rawProps, key, isStaticChildren) {
     }, key);
   }
   const computedStyle = flatten(resolved, false);
+  if (isWeb) {
+    if (computedStyle.display === "grid" || computedStyle.display === "inline-grid") delete computedStyle.display;
+    delete computedStyle.gridTemplateColumns;
+    delete computedStyle.gridTemplateRows;
+    delete computedStyle.gridColumn;
+    delete computedStyle.gridRow;
+    delete computedStyle.gridArea;
+    delete computedStyle.gridAutoFlow;
+    delete computedStyle.gridAutoColumns;
+    delete computedStyle.gridAutoRows;
+  }
   const finalStyle = mergeStyle(computedStyle, userStyle);
-  return makeElement(isStaticChildren, type, {
+  return makeElement(isStaticChildren, actualType, {
     ...passProps,
     style: finalStyle,
     ...isWeb && classStr ? { className: classStr } : {}

package/dist/{chunk-XL3F5GRY.mjs → chunk-OJE5MVCI.mjs}

@@ -829,6 +829,7 @@ var STANDALONE_UTILITIES = /* @__PURE__ */ new Set([
   "grid",
   "inline-flex",
   "inline-grid",
+  "grd",
   "hidden",
   "contents",
   "flow-root",
@@ -1142,6 +1143,7 @@ var STANDALONE = {
   "inline-block": isWeb ? { display: "inline-block" } : null,
   inline: isWeb ? { display: "inline" } : null,
   grid: isWeb ? { display: "grid" } : null,
+  grd: isWeb ? { display: "grid" } : null,
   "inline-flex": { display: isWeb ? "inline-flex" : "flex" },
   "inline-grid": isWeb ? { display: "inline-grid" } : null,
   hidden: { display: "none" },
@@ -2414,7 +2416,21 @@ var InteractiveWrapper = forwardRef(
     const handleFocus = useCallback(chain(onFocus, () => setFocused(true)), [onFocus]);
     const handleBlur = useCallback(chain(onBlur, () => setFocused(false)), [onBlur]);
     const computedStyle = useMemo(
-      () => flatten(resolvedStyle, isDark, { pressed, hover: hovered, focus: focused }, breakpoints),
+      () => {
+        const s = flatten(resolvedStyle, isDark, { pressed, hover: hovered, focus: focused }, breakpoints);
+        if (isWeb) {
+          if (s.display === "grid" || s.display === "inline-grid") delete s.display;
+          delete s.gridTemplateColumns;
+          delete s.gridTemplateRows;
+          delete s.gridColumn;
+          delete s.gridRow;
+          delete s.gridArea;
+          delete s.gridAutoFlow;
+          delete s.gridAutoColumns;
+          delete s.gridAutoRows;
+        }
+        return s;
+      },
       [resolvedStyle, isDark, pressed, hovered, focused, width]
       // eslint-disable-line react-hooks/exhaustive-deps
     );

package/dist/index.js

@@ -995,6 +995,7 @@ var STANDALONE_UTILITIES = /* @__PURE__ */ new Set([
   "grid",
   "inline-flex",
   "inline-grid",
+  "grd",
   "hidden",
   "contents",
   "flow-root",
@@ -1308,6 +1309,7 @@ var STANDALONE = {
   "inline-block": isWeb ? { display: "inline-block" } : null,
   inline: isWeb ? { display: "inline" } : null,
   grid: isWeb ? { display: "grid" } : null,
+  grd: isWeb ? { display: "grid" } : null,
   "inline-flex": { display: isWeb ? "inline-flex" : "flex" },
   "inline-grid": isWeb ? { display: "inline-grid" } : null,
   hidden: { display: "none" },
@@ -2918,7 +2920,21 @@ var InteractiveWrapper = (0, import_react9.forwardRef)(
     const handleFocus = (0, import_react9.useCallback)(chain(onFocus, () => setFocused(true)), [onFocus]);
     const handleBlur = (0, import_react9.useCallback)(chain(onBlur, () => setFocused(false)), [onBlur]);
     const computedStyle = (0, import_react9.useMemo)(
-      () => flatten(resolvedStyle, isDark, { pressed, hover: hovered, focus: focused }, breakpoints),
+      () => {
+        const s = flatten(resolvedStyle, isDark, { pressed, hover: hovered, focus: focused }, breakpoints);
+        if (isWeb) {
+          if (s.display === "grid" || s.display === "inline-grid") delete s.display;
+          delete s.gridTemplateColumns;
+          delete s.gridTemplateRows;
+          delete s.gridColumn;
+          delete s.gridRow;
+          delete s.gridArea;
+          delete s.gridAutoFlow;
+          delete s.gridAutoColumns;
+          delete s.gridAutoRows;
+        }
+        return s;
+      },
       [resolvedStyle, isDark, pressed, hovered, focused, width]
       // eslint-disable-line react-hooks/exhaustive-deps
     );

package/dist/index.mjs

@@ -21,7 +21,7 @@ import {
   updateConfig,
   useGlobalDarkMode,
   useGlobalWidth
-} from "./chunk-XL3F5GRY.mjs";
+} from "./chunk-OJE5MVCI.mjs";
 
 // src/context.tsx
 import { createContext, useContext } from "react";

package/dist/jsx-dev-runtime.js

@@ -898,6 +898,7 @@ var STANDALONE_UTILITIES = /* @__PURE__ */ new Set([
   "grid",
   "inline-flex",
   "inline-grid",
+  "grd",
   "hidden",
   "contents",
   "flow-root",
@@ -1211,6 +1212,7 @@ var STANDALONE = {
   "inline-block": isWeb ? { display: "inline-block" } : null,
   inline: isWeb ? { display: "inline" } : null,
   grid: isWeb ? { display: "grid" } : null,
+  grd: isWeb ? { display: "grid" } : null,
   "inline-flex": { display: isWeb ? "inline-flex" : "flex" },
   "inline-grid": isWeb ? { display: "inline-grid" } : null,
   hidden: { display: "none" },
@@ -2397,7 +2399,21 @@ var InteractiveWrapper = (0, import_react3.forwardRef)(
     const handleFocus = (0, import_react3.useCallback)(chain(onFocus, () => setFocused(true)), [onFocus]);
     const handleBlur = (0, import_react3.useCallback)(chain(onBlur, () => setFocused(false)), [onBlur]);
     const computedStyle = (0, import_react3.useMemo)(
-      () => flatten(resolvedStyle, isDark, { pressed, hover: hovered, focus: focused }, breakpoints),
+      () => {
+        const s = flatten(resolvedStyle, isDark, { pressed, hover: hovered, focus: focused }, breakpoints);
+        if (isWeb) {
+          if (s.display === "grid" || s.display === "inline-grid") delete s.display;
+          delete s.gridTemplateColumns;
+          delete s.gridTemplateRows;
+          delete s.gridColumn;
+          delete s.gridRow;
+          delete s.gridArea;
+          delete s.gridAutoFlow;
+          delete s.gridAutoColumns;
+          delete s.gridAutoRows;
+        }
+        return s;
+      },
       [resolvedStyle, isDark, pressed, hovered, focused, width]
       // eslint-disable-line react-hooks/exhaustive-deps
     );
@@ -2439,12 +2455,24 @@ var DarkWrapper = import_react4.default.forwardRef(
     const width = useConditionalWidth(needsWidth);
     const breakpoints = needsWidth ? getActiveBreakpoints(width) : EMPTY_BREAKPOINTS;
     const computedStyle = flatten(resolvedStyle, isDark, {}, breakpoints);
+    if (isWeb) stripWebGridProps(computedStyle);
     const finalStyle = styleProp ? Array.isArray(styleProp) ? Object.assign({}, computedStyle, ...styleProp) : { ...computedStyle, ...styleProp } : computedStyle;
     const props = { ref, ...rest, style: finalStyle };
     return Array.isArray(children) ? import_react4.default.createElement(Component, props, ...children) : import_react4.default.createElement(Component, props, children);
   }
 );
 DarkWrapper.displayName = "Kbach.DarkWrapper";
+function stripWebGridProps(s) {
+  if (s.display === "grid" || s.display === "inline-grid") delete s.display;
+  delete s.gridTemplateColumns;
+  delete s.gridTemplateRows;
+  delete s.gridColumn;
+  delete s.gridRow;
+  delete s.gridArea;
+  delete s.gridAutoFlow;
+  delete s.gridAutoColumns;
+  delete s.gridAutoRows;
+}
 
 // src/jsx-runtime.tsx
 var INTERACTIVE_MODS = /* @__PURE__ */ new Set([
@@ -2522,12 +2550,14 @@ function processElement(type, rawProps, key, isStaticChildren) {
     return makeElement(isStaticChildren, type, rawProps, key);
   }
   const config = getConfig();
+  const isGrdOnWeb = isWeb && classStr != null && /(?:^|\s)grd(?:\s|$)/.test(classStr);
+  const actualType = isGrdOnWeb ? "div" : type;
   const resolved = __kbachStyles ?? (classStr ? resolve(classStr, config.theme, config.darkMode) : {});
   const { style: userStyle, ...passProps } = omitConsumed(rawProps);
   const { interactive, modeOrResponsive } = bucketMods(resolved);
   if (interactive) {
     return (0, import_jsx_runtime.jsx)(InteractiveWrapper, {
-      Component: type,
+      Component: actualType,
       resolvedStyle: resolved,
       ...isWeb && classStr ? { className: classStr } : {},
       style: userStyle,
@@ -2536,7 +2566,7 @@ function processElement(type, rawProps, key, isStaticChildren) {
   }
   if (modeOrResponsive) {
     return (0, import_jsx_runtime.jsx)(DarkWrapper, {
-      Component: type,
+      Component: actualType,
       resolvedStyle: resolved,
       ...isWeb && classStr ? { className: classStr } : {},
       style: userStyle,
@@ -2544,8 +2574,19 @@ function processElement(type, rawProps, key, isStaticChildren) {
     }, key);
   }
   const computedStyle = flatten(resolved, false);
+  if (isWeb) {
+    if (computedStyle.display === "grid" || computedStyle.display === "inline-grid") delete computedStyle.display;
+    delete computedStyle.gridTemplateColumns;
+    delete computedStyle.gridTemplateRows;
+    delete computedStyle.gridColumn;
+    delete computedStyle.gridRow;
+    delete computedStyle.gridArea;
+    delete computedStyle.gridAutoFlow;
+    delete computedStyle.gridAutoColumns;
+    delete computedStyle.gridAutoRows;
+  }
   const finalStyle = mergeStyle(computedStyle, userStyle);
-  return makeElement(isStaticChildren, type, {
+  return makeElement(isStaticChildren, actualType, {
     ...passProps,
     style: finalStyle,
     ...isWeb && classStr ? { className: classStr } : {}

package/dist/jsx-dev-runtime.mjs

@@ -2,8 +2,8 @@ import {
   Fragment,
   jsx,
   jsxs
-} from "./chunk-BBWDCPU6.mjs";
-import "./chunk-XL3F5GRY.mjs";
+} from "./chunk-6FOS3PUK.mjs";
+import "./chunk-OJE5MVCI.mjs";
 
 // src/jsx-dev-runtime.tsx
 function jsxDEV(type, props, key, isStaticChildren, _source, _self) {

package/dist/jsx-runtime.js

@@ -897,6 +897,7 @@ var STANDALONE_UTILITIES = /* @__PURE__ */ new Set([
   "grid",
   "inline-flex",
   "inline-grid",
+  "grd",
   "hidden",
   "contents",
   "flow-root",
@@ -1210,6 +1211,7 @@ var STANDALONE = {
   "inline-block": isWeb ? { display: "inline-block" } : null,
   inline: isWeb ? { display: "inline" } : null,
   grid: isWeb ? { display: "grid" } : null,
+  grd: isWeb ? { display: "grid" } : null,
   "inline-flex": { display: isWeb ? "inline-flex" : "flex" },
   "inline-grid": isWeb ? { display: "inline-grid" } : null,
   hidden: { display: "none" },
@@ -2396,7 +2398,21 @@ var InteractiveWrapper = (0, import_react3.forwardRef)(
     const handleFocus = (0, import_react3.useCallback)(chain(onFocus, () => setFocused(true)), [onFocus]);
     const handleBlur = (0, import_react3.useCallback)(chain(onBlur, () => setFocused(false)), [onBlur]);
     const computedStyle = (0, import_react3.useMemo)(
-      () => flatten(resolvedStyle, isDark, { pressed, hover: hovered, focus: focused }, breakpoints),
+      () => {
+        const s = flatten(resolvedStyle, isDark, { pressed, hover: hovered, focus: focused }, breakpoints);
+        if (isWeb) {
+          if (s.display === "grid" || s.display === "inline-grid") delete s.display;
+          delete s.gridTemplateColumns;
+          delete s.gridTemplateRows;
+          delete s.gridColumn;
+          delete s.gridRow;
+          delete s.gridArea;
+          delete s.gridAutoFlow;
+          delete s.gridAutoColumns;
+          delete s.gridAutoRows;
+        }
+        return s;
+      },
       [resolvedStyle, isDark, pressed, hovered, focused, width]
       // eslint-disable-line react-hooks/exhaustive-deps
     );
@@ -2438,12 +2454,24 @@ var DarkWrapper = import_react4.default.forwardRef(
     const width = useConditionalWidth(needsWidth);
     const breakpoints = needsWidth ? getActiveBreakpoints(width) : EMPTY_BREAKPOINTS;
     const computedStyle = flatten(resolvedStyle, isDark, {}, breakpoints);
+    if (isWeb) stripWebGridProps(computedStyle);
     const finalStyle = styleProp ? Array.isArray(styleProp) ? Object.assign({}, computedStyle, ...styleProp) : { ...computedStyle, ...styleProp } : computedStyle;
     const props = { ref, ...rest, style: finalStyle };
     return Array.isArray(children) ? import_react4.default.createElement(Component, props, ...children) : import_react4.default.createElement(Component, props, children);
   }
 );
 DarkWrapper.displayName = "Kbach.DarkWrapper";
+function stripWebGridProps(s) {
+  if (s.display === "grid" || s.display === "inline-grid") delete s.display;
+  delete s.gridTemplateColumns;
+  delete s.gridTemplateRows;
+  delete s.gridColumn;
+  delete s.gridRow;
+  delete s.gridArea;
+  delete s.gridAutoFlow;
+  delete s.gridAutoColumns;
+  delete s.gridAutoRows;
+}
 
 // src/jsx-runtime.tsx
 var INTERACTIVE_MODS = /* @__PURE__ */ new Set([
@@ -2521,12 +2549,14 @@ function processElement(type, rawProps, key, isStaticChildren) {
     return makeElement(isStaticChildren, type, rawProps, key);
   }
   const config = getConfig();
+  const isGrdOnWeb = isWeb && classStr != null && /(?:^|\s)grd(?:\s|$)/.test(classStr);
+  const actualType = isGrdOnWeb ? "div" : type;
   const resolved = __kbachStyles ?? (classStr ? resolve(classStr, config.theme, config.darkMode) : {});
   const { style: userStyle, ...passProps } = omitConsumed(rawProps);
   const { interactive, modeOrResponsive } = bucketMods(resolved);
   if (interactive) {
     return (0, import_jsx_runtime.jsx)(InteractiveWrapper, {
-      Component: type,
+      Component: actualType,
       resolvedStyle: resolved,
       ...isWeb && classStr ? { className: classStr } : {},
       style: userStyle,
@@ -2535,7 +2565,7 @@ function processElement(type, rawProps, key, isStaticChildren) {
   }
   if (modeOrResponsive) {
     return (0, import_jsx_runtime.jsx)(DarkWrapper, {
-      Component: type,
+      Component: actualType,
       resolvedStyle: resolved,
       ...isWeb && classStr ? { className: classStr } : {},
       style: userStyle,
@@ -2543,8 +2573,19 @@ function processElement(type, rawProps, key, isStaticChildren) {
     }, key);
   }
   const computedStyle = flatten(resolved, false);
+  if (isWeb) {
+    if (computedStyle.display === "grid" || computedStyle.display === "inline-grid") delete computedStyle.display;
+    delete computedStyle.gridTemplateColumns;
+    delete computedStyle.gridTemplateRows;
+    delete computedStyle.gridColumn;
+    delete computedStyle.gridRow;
+    delete computedStyle.gridArea;
+    delete computedStyle.gridAutoFlow;
+    delete computedStyle.gridAutoColumns;
+    delete computedStyle.gridAutoRows;
+  }
   const finalStyle = mergeStyle(computedStyle, userStyle);
-  return makeElement(isStaticChildren, type, {
+  return makeElement(isStaticChildren, actualType, {
     ...passProps,
     style: finalStyle,
     ...isWeb && classStr ? { className: classStr } : {}

package/dist/jsx-runtime.mjs

@@ -2,8 +2,8 @@ import {
   Fragment,
   jsx,
   jsxs
-} from "./chunk-BBWDCPU6.mjs";
-import "./chunk-XL3F5GRY.mjs";
+} from "./chunk-6FOS3PUK.mjs";
+import "./chunk-OJE5MVCI.mjs";
 export {
   Fragment,
   jsx,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kbach/react",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "description": "React / React Native components and hooks for the Kbach framework",
   "source": "./src/index.ts",
   "main": "./dist/index.js",