@weaverse/react 0.6.4 → 0.6.8

package/dist/index.d.ts

@@ -1,10 +1,18 @@
 import { WeaverseType, Weaverse } from '@weaverse/core';
 export * from '@weaverse/core';
+import React$1 from 'react';
 
 declare const createRootContext: (configs: WeaverseType) => Weaverse;
+declare let WeaverseContext: React$1.Context<Weaverse>;
+declare let WeaverseContextProvider: React$1.Provider<Weaverse>;
+declare let WeaverseContextConsumer: React$1.Consumer<Weaverse>;
 declare type WeaverseRootPropsType = {
     context: Weaverse;
 };
 declare const WeaverseRoot: ({ context }: WeaverseRootPropsType) => JSX.Element;
 
-export { WeaverseRoot, WeaverseRootPropsType, createRootContext };
+interface WeaverseElementProps {
+    children?: React.ReactNode;
+}
+
+export { WeaverseContext, WeaverseContextConsumer, WeaverseContextProvider, WeaverseElementProps, WeaverseRoot, WeaverseRootPropsType, createRootContext };

package/dist/index.js

@@ -52,6 +52,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  WeaverseContext: () => WeaverseContext,
+  WeaverseContextConsumer: () => WeaverseContextConsumer,
+  WeaverseContextProvider: () => WeaverseContextProvider,
   WeaverseRoot: () => WeaverseRoot,
   createRootContext: () => createRootContext
 });
@@ -79,7 +82,15 @@ var base_default = BaseElement;
 // src/elements/button.tsx
 var React2 = __toESM(require("react"));
 var Button = React2.forwardRef((props, ref) => {
-  const _a = props, { buttonType, css } = _a, rest = __objRest(_a, ["buttonType", "css"]);
+  const _a = props, { buttonType, css, openInNewTab = false, target = "" } = _a, rest = __objRest(_a, ["buttonType", "css", "openInNewTab", "target"]);
+  if (target) {
+    return /* @__PURE__ */ React2.createElement("a", {
+      href: target,
+      target: openInNewTab ? "_blank" : "_self"
+    }, /* @__PURE__ */ React2.createElement("button", __spreadValues({
+      ref
+    }, rest), props.value));
+  }
   return /* @__PURE__ */ React2.createElement("button", __spreadValues({
     ref
   }, rest), props.value);
@@ -114,6 +125,12 @@ var schema2 = {
     },
     {
       type: "duplicate"
+    },
+    {
+      type: "link"
+    },
+    {
+      type: "color"
     }
   ],
   data: {
@@ -123,7 +140,9 @@ var schema2 = {
         fontSize: "13px",
         padding: "10px 15px"
       }
-    }
+    },
+    target: "",
+    openInNewTab: false
   }
 };
 var button_default = Button;
@@ -161,11 +180,20 @@ var container_default = Container;
 // src/elements/layout.tsx
 var import_react3 = __toESM(require("react"));
 var Layout = (0, import_react3.forwardRef)((props, ref) => {
-  return /* @__PURE__ */ import_react3.default.createElement("div", __spreadProps(__spreadValues({
-    ref
-  }, props), {
-    children: props.children
-  }));
+  const _a = props, { css, children, rows, gap, rowSize, columns, gridSize } = _a, rest = __objRest(_a, ["css", "children", "rows", "gap", "rowSize", "columns", "gridSize"]);
+  return /* @__PURE__ */ import_react3.default.createElement("section", __spreadValues({
+    ref,
+    style: {
+      "--grid-size": gridSize + "px",
+      "--rows": rows,
+      "--columns": columns,
+      "--gap": gap + "px",
+      "--row-size": rowSize + "px",
+      "--col-size": "calc((var(--grid-size) - calc(var(--columns) - 1) * var(--gap)) / var(--columns))"
+    }
+  }, rest), /* @__PURE__ */ import_react3.default.createElement("div", {
+    "data-layout-content": true
+  }, children));
 });
 var schema4 = {
   title: "Layout",
@@ -173,20 +201,33 @@ var schema4 = {
   data: {
     css: {
       "@desktop": {
-        display: "grid !important",
-        gridTemplateRows: "repeat($row-count, $row-size)",
-        gridTemplateColumns: "repeat($column-count, 1fr)",
-        gridGap: "$gap",
-        minHeight: "104px",
-        width: "$width",
-        maxWidth: "$max-width",
-        margin: "0 auto"
+        overflow: "hidden",
+        paddingTop: "16px",
+        paddingBottom: "16px",
+        paddingLeft: "var(--gap)",
+        paddingRight: "var(--gap)",
+        "> [data-layout-content]": {
+          margin: "0 auto",
+          display: "grid !important",
+          gridTemplateRows: "repeat(var(--rows), var(--row-size))",
+          gridTemplateColumns: "repeat(var(--columns), minmax(0, var(--col-size)))",
+          gap: "var(--gap)",
+          maxWidth: "var(--grid-size)"
+        }
       },
       "@mobile": {
-        display: "flex !important",
-        flexDirection: "column"
+        padding: "0",
+        "> [data-layout-content]": {
+          display: "flex !important",
+          flexDirection: "column"
+        }
       }
-    }
+    },
+    gridSize: 1224,
+    rows: 12,
+    columns: 12,
+    gap: 16,
+    rowSize: 48
   },
   settings: []
 };
@@ -207,7 +248,7 @@ Text.defaultProps = {
 };
 var schema5 = {
   type: "text",
-  title: "Text Settings",
+  title: "Text",
   settings: [],
   data: {
     css: {
@@ -294,7 +335,7 @@ var shortCssObject = (css) => {
 
 // src/renderer.tsx
 var import_core = require("@weaverse/core");
-var React7 = __toESM(require("react"));
+var import_react5 = __toESM(require("react"));
 var createRootContext = (configs) => {
   const rootContext = new import_core.Weaverse(configs);
   Object.keys(elements_default).forEach((key) => {
@@ -302,10 +343,13 @@ var createRootContext = (configs) => {
   });
   return rootContext;
 };
+var WeaverseContext = (0, import_react5.createContext)({});
+var WeaverseContextProvider = WeaverseContext.Provider;
+var WeaverseContextConsumer = WeaverseContext.Consumer;
 var WeaverseRoot = ({ context }) => {
   var _a;
-  let [, setData] = React7.useState(context.projectData);
-  React7.useEffect(() => {
+  let [, setData] = (0, import_react5.useState)(context.projectData);
+  (0, import_react5.useEffect)(() => {
     let handleUpdate = () => {
       setData({});
     };
@@ -319,17 +363,19 @@ var WeaverseRoot = ({ context }) => {
   }, []);
   let eventHandlers = ((_a = context == null ? void 0 : context.studioBridge) == null ? void 0 : _a.eventHandlers) || {};
   let themeClass = context.stitchesInstance.theme.className;
-  return /* @__PURE__ */ React7.createElement("div", __spreadValues({
+  return /* @__PURE__ */ import_react5.default.createElement("div", __spreadValues({
     className: `weaverse-content-root ${themeClass}`
-  }, eventHandlers), /* @__PURE__ */ React7.createElement(RenderItem, {
-    itemId: context.projectData.rootId || 0,
-    context
-  }));
+  }, eventHandlers), /* @__PURE__ */ import_react5.default.createElement(WeaverseContextProvider, {
+    value: context
+  }, /* @__PURE__ */ import_react5.default.createElement(RenderItem, {
+    itemId: context.projectData.rootId || 0
+  })));
 };
-var Item = ({ itemInstance, elementInstances, context }) => {
-  let [data, setData] = React7.useState(itemInstance.data);
-  let _a = data, { id, type, childIds, css, className } = _a, rest = __objRest(_a, ["id", "type", "childIds", "css", "className"]);
-  React7.useEffect(() => {
+var Item = ({ itemInstance, elementInstances }) => {
+  var _b;
+  let [data, setData] = (0, import_react5.useState)(itemInstance.data);
+  let _a = data, { id, type, childIds, css, className: cls = "" } = _a, rest = __objRest(_a, ["id", "type", "childIds", "css", "className"]);
+  (0, import_react5.useEffect)(() => {
     let handleUpdate = (update) => {
       setData(__spreadValues({}, update));
     };
@@ -343,11 +389,15 @@ var Item = ({ itemInstance, elementInstances, context }) => {
       itemInstance.unsubscribe(handleUpdate);
     };
   }, []);
-  let realClassName = className;
+  let context = (0, import_react5.useContext)(WeaverseContext);
+  let className = "";
   if (css) {
     let formattedCss = shortCssObject(css);
-    let selector = context.stitchesInstance.css(formattedCss)().className;
-    realClassName = realClassName ? `${selector} ${realClassName}` : selector;
+    let { className: newClass = "" } = context.stitchesInstance.css(formattedCss)();
+    let { stitchesClass } = itemInstance;
+    let otherClass = (((_b = itemInstance.ref.current) == null ? void 0 : _b.className) || "").replace(stitchesClass, "").replace(cls, "").trim();
+    className = `${cls} ${newClass} ${otherClass}`.trim();
+    itemInstance.stitchesClass = newClass;
   }
   let element = elementInstances.get(type) || elementInstances.get("base");
   if (element == null ? void 0 : element.Component) {
@@ -355,41 +405,42 @@ var Item = ({ itemInstance, elementInstances, context }) => {
     if (Component.$$typeof === Symbol.for("react.forward_ref")) {
       rest.ref = itemInstance.ref;
     }
-    return /* @__PURE__ */ React7.createElement(Component, __spreadProps(__spreadValues({
+    return /* @__PURE__ */ import_react5.default.createElement(Component, __spreadProps(__spreadValues({
       key: id,
       "data-wv-type": type,
       "data-wv-id": id
     }, rest), {
-      className: realClassName
-    }), Array.isArray(childIds) && childIds.map((childId) => /* @__PURE__ */ React7.createElement(RenderItem, {
+      className
+    }), Array.isArray(childIds) && childIds.map((childId) => /* @__PURE__ */ import_react5.default.createElement(RenderItem, {
       key: childId,
-      itemId: childId,
-      context
+      itemId: childId
     })));
   }
   return null;
 };
 var RenderItem = ({
-  itemId,
-  context
+  itemId
 }) => {
+  let context = (0, import_react5.useContext)(WeaverseContext);
   let { itemInstances, elementInstances } = context;
   let itemInstance = itemInstances.get(itemId);
   if (itemInstance) {
-    return /* @__PURE__ */ React7.createElement(Item, {
+    return /* @__PURE__ */ import_react5.default.createElement(Item, {
       itemInstance,
-      elementInstances,
-      context
+      elementInstances
     });
   }
   console.warn(`Item instance ${itemId} not found`);
-  return /* @__PURE__ */ React7.createElement(React7.Fragment, null);
+  return /* @__PURE__ */ import_react5.default.createElement(import_react5.default.Fragment, null);
 };
 
 // src/index.ts
 __reExport(src_exports, require("@weaverse/core"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  WeaverseContext,
+  WeaverseContextConsumer,
+  WeaverseContextProvider,
   WeaverseRoot,
   createRootContext
 });

package/dist/index.mjs

@@ -52,7 +52,15 @@ var base_default = BaseElement;
 // src/elements/button.tsx
 import * as React2 from "react";
 var Button = React2.forwardRef((props, ref) => {
-  const _a = props, { buttonType, css } = _a, rest = __objRest(_a, ["buttonType", "css"]);
+  const _a = props, { buttonType, css, openInNewTab = false, target = "" } = _a, rest = __objRest(_a, ["buttonType", "css", "openInNewTab", "target"]);
+  if (target) {
+    return /* @__PURE__ */ React2.createElement("a", {
+      href: target,
+      target: openInNewTab ? "_blank" : "_self"
+    }, /* @__PURE__ */ React2.createElement("button", __spreadValues({
+      ref
+    }, rest), props.value));
+  }
   return /* @__PURE__ */ React2.createElement("button", __spreadValues({
     ref
   }, rest), props.value);
@@ -87,6 +95,12 @@ var schema2 = {
     },
     {
       type: "duplicate"
+    },
+    {
+      type: "link"
+    },
+    {
+      type: "color"
     }
   ],
   data: {
@@ -96,7 +110,9 @@ var schema2 = {
         fontSize: "13px",
         padding: "10px 15px"
       }
-    }
+    },
+    target: "",
+    openInNewTab: false
   }
 };
 var button_default = Button;
@@ -134,11 +150,20 @@ var container_default = Container;
 // src/elements/layout.tsx
 import React4, { forwardRef as forwardRef3 } from "react";
 var Layout = forwardRef3((props, ref) => {
-  return /* @__PURE__ */ React4.createElement("div", __spreadProps(__spreadValues({
-    ref
-  }, props), {
-    children: props.children
-  }));
+  const _a = props, { css, children, rows, gap, rowSize, columns, gridSize } = _a, rest = __objRest(_a, ["css", "children", "rows", "gap", "rowSize", "columns", "gridSize"]);
+  return /* @__PURE__ */ React4.createElement("section", __spreadValues({
+    ref,
+    style: {
+      "--grid-size": gridSize + "px",
+      "--rows": rows,
+      "--columns": columns,
+      "--gap": gap + "px",
+      "--row-size": rowSize + "px",
+      "--col-size": "calc((var(--grid-size) - calc(var(--columns) - 1) * var(--gap)) / var(--columns))"
+    }
+  }, rest), /* @__PURE__ */ React4.createElement("div", {
+    "data-layout-content": true
+  }, children));
 });
 var schema4 = {
   title: "Layout",
@@ -146,20 +171,33 @@ var schema4 = {
   data: {
     css: {
       "@desktop": {
-        display: "grid !important",
-        gridTemplateRows: "repeat($row-count, $row-size)",
-        gridTemplateColumns: "repeat($column-count, 1fr)",
-        gridGap: "$gap",
-        minHeight: "104px",
-        width: "$width",
-        maxWidth: "$max-width",
-        margin: "0 auto"
+        overflow: "hidden",
+        paddingTop: "16px",
+        paddingBottom: "16px",
+        paddingLeft: "var(--gap)",
+        paddingRight: "var(--gap)",
+        "> [data-layout-content]": {
+          margin: "0 auto",
+          display: "grid !important",
+          gridTemplateRows: "repeat(var(--rows), var(--row-size))",
+          gridTemplateColumns: "repeat(var(--columns), minmax(0, var(--col-size)))",
+          gap: "var(--gap)",
+          maxWidth: "var(--grid-size)"
+        }
       },
       "@mobile": {
-        display: "flex !important",
-        flexDirection: "column"
+        padding: "0",
+        "> [data-layout-content]": {
+          display: "flex !important",
+          flexDirection: "column"
+        }
       }
-    }
+    },
+    gridSize: 1224,
+    rows: 12,
+    columns: 12,
+    gap: 16,
+    rowSize: 48
   },
   settings: []
 };
@@ -180,7 +218,7 @@ Text.defaultProps = {
 };
 var schema5 = {
   type: "text",
-  title: "Text Settings",
+  title: "Text",
   settings: [],
   data: {
     css: {
@@ -266,11 +304,8 @@ var shortCssObject = (css) => {
 };
 
 // src/renderer.tsx
-import {
-  isBrowser,
-  Weaverse
-} from "@weaverse/core";
-import * as React7 from "react";
+import { isBrowser, Weaverse } from "@weaverse/core";
+import React7, { createContext, useContext, useEffect, useState } from "react";
 var createRootContext = (configs) => {
   const rootContext = new Weaverse(configs);
   Object.keys(elements_default).forEach((key) => {
@@ -278,10 +313,13 @@ var createRootContext = (configs) => {
   });
   return rootContext;
 };
+var WeaverseContext = createContext({});
+var WeaverseContextProvider = WeaverseContext.Provider;
+var WeaverseContextConsumer = WeaverseContext.Consumer;
 var WeaverseRoot = ({ context }) => {
   var _a;
-  let [, setData] = React7.useState(context.projectData);
-  React7.useEffect(() => {
+  let [, setData] = useState(context.projectData);
+  useEffect(() => {
     let handleUpdate = () => {
       setData({});
     };
@@ -297,15 +335,17 @@ var WeaverseRoot = ({ context }) => {
   let themeClass = context.stitchesInstance.theme.className;
   return /* @__PURE__ */ React7.createElement("div", __spreadValues({
     className: `weaverse-content-root ${themeClass}`
-  }, eventHandlers), /* @__PURE__ */ React7.createElement(RenderItem, {
-    itemId: context.projectData.rootId || 0,
-    context
-  }));
+  }, eventHandlers), /* @__PURE__ */ React7.createElement(WeaverseContextProvider, {
+    value: context
+  }, /* @__PURE__ */ React7.createElement(RenderItem, {
+    itemId: context.projectData.rootId || 0
+  })));
 };
-var Item = ({ itemInstance, elementInstances, context }) => {
-  let [data, setData] = React7.useState(itemInstance.data);
-  let _a = data, { id, type, childIds, css, className } = _a, rest = __objRest(_a, ["id", "type", "childIds", "css", "className"]);
-  React7.useEffect(() => {
+var Item = ({ itemInstance, elementInstances }) => {
+  var _b;
+  let [data, setData] = useState(itemInstance.data);
+  let _a = data, { id, type, childIds, css, className: cls = "" } = _a, rest = __objRest(_a, ["id", "type", "childIds", "css", "className"]);
+  useEffect(() => {
     let handleUpdate = (update) => {
       setData(__spreadValues({}, update));
     };
@@ -319,11 +359,15 @@ var Item = ({ itemInstance, elementInstances, context }) => {
       itemInstance.unsubscribe(handleUpdate);
     };
   }, []);
-  let realClassName = className;
+  let context = useContext(WeaverseContext);
+  let className = "";
   if (css) {
     let formattedCss = shortCssObject(css);
-    let selector = context.stitchesInstance.css(formattedCss)().className;
-    realClassName = realClassName ? `${selector} ${realClassName}` : selector;
+    let { className: newClass = "" } = context.stitchesInstance.css(formattedCss)();
+    let { stitchesClass } = itemInstance;
+    let otherClass = (((_b = itemInstance.ref.current) == null ? void 0 : _b.className) || "").replace(stitchesClass, "").replace(cls, "").trim();
+    className = `${cls} ${newClass} ${otherClass}`.trim();
+    itemInstance.stitchesClass = newClass;
   }
   let element = elementInstances.get(type) || elementInstances.get("base");
   if (element == null ? void 0 : element.Component) {
@@ -336,26 +380,24 @@ var Item = ({ itemInstance, elementInstances, context }) => {
       "data-wv-type": type,
       "data-wv-id": id
     }, rest), {
-      className: realClassName
+      className
     }), Array.isArray(childIds) && childIds.map((childId) => /* @__PURE__ */ React7.createElement(RenderItem, {
       key: childId,
-      itemId: childId,
-      context
+      itemId: childId
     })));
   }
   return null;
 };
 var RenderItem = ({
-  itemId,
-  context
+  itemId
 }) => {
+  let context = useContext(WeaverseContext);
   let { itemInstances, elementInstances } = context;
   let itemInstance = itemInstances.get(itemId);
   if (itemInstance) {
     return /* @__PURE__ */ React7.createElement(Item, {
       itemInstance,
-      elementInstances,
-      context
+      elementInstances
     });
   }
   console.warn(`Item instance ${itemId} not found`);
@@ -365,6 +407,9 @@ var RenderItem = ({
 // src/index.ts
 export * from "@weaverse/core";
 export {
+  WeaverseContext,
+  WeaverseContextConsumer,
+  WeaverseContextProvider,
   WeaverseRoot,
   createRootContext
 };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.6.4",
+  "version": "0.6.8",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -31,6 +31,6 @@
   "name": "@weaverse/react",
   "author": "Weaverse Team",
   "dependencies": {
-    "@weaverse/core": "0.6.4"
+    "@weaverse/core": "0.6.8"
   }
 }