@plasmicpkgs/plasmic-rich-components 1.0.103 → 1.0.105

package/dist/index.js

@@ -2,10 +2,10 @@
 
 var registerComponent = require('@plasmicapp/host/registerComponent');
 require('@plasmicapp/host/registerGlobalContext');
-require('lodash/get');
 var React = require('react');
-var dataSources = require('@plasmicapp/data-sources');
 var antd = require('antd');
+require('lodash/get');
+var dataSources = require('@plasmicapp/data-sources');
 var tinycolor = require('@ctrl/tinycolor');
 var icons = require('@ant-design/icons');
 var proComponents = require('@ant-design/pro-components');
@@ -63,6 +63,36 @@ const mkShortId = () => `${Math.random()}`;
 function withoutFalsey(xs) {
   return xs.filter((x) => !!x);
 }
+class ErrorBoundary extends React__default.default.Component {
+  constructor() {
+    super(...arguments);
+    this.state = { hasError: false, errorInfo: "" };
+  }
+  static getDerivedStateFromError(error) {
+    return { hasError: true, errorInfo: error.message };
+  }
+  componentDidCatch(error, errorInfo) {
+    console.log(error, errorInfo);
+  }
+  componentDidUpdate(prevProps, prevState) {
+    if (prevProps.canvasEnvId !== this.props.canvasEnvId && prevState.hasError) {
+      this.setState({ hasError: false });
+    }
+  }
+  render() {
+    if (this.state.hasError) {
+      return /* @__PURE__ */ React__default.default.createElement(
+        antd.Result,
+        {
+          status: "error",
+          title: "Something went wrong.",
+          extra: this.state.errorInfo
+        }
+      );
+    }
+    return this.props.children;
+  }
+}
 
 var __defProp$9 = Object.defineProperty;
 var __defProps$7 = Object.defineProperties;
@@ -1459,9 +1489,10 @@ function RichTable(props) {
   if (!isClient) {
     return null;
   }
-  return /* @__PURE__ */ React__default.default.createElement("div", { className: `${className} ${scopeClassName != null ? scopeClassName : ""}` }, /* @__PURE__ */ React__default.default.createElement(
+  return /* @__PURE__ */ React__default.default.createElement("div", { className: `${className} ${scopeClassName != null ? scopeClassName : ""}` }, /* @__PURE__ */ React__default.default.createElement(ErrorBoundary, { canvasEnvId: props["data-plasmic-canvas-envs"] }, /* @__PURE__ */ React__default.default.createElement(
     proComponents.ProTable,
     __spreadProps$2(__spreadValues$3({
+      ErrorBoundary: false,
       rowClassName: props.onRowClick || props.canSelectRows === "click" ? "plasmic-table-row-clickable" : void 0,
       actionRef,
       columns: columnDefinitions,
@@ -1518,7 +1549,7 @@ function RichTable(props) {
         !hideExports && /* @__PURE__ */ React__default.default.createElement(ExportMenu, { data })
       ].filter((x) => !!x)
     })
-  ), /* @__PURE__ */ React__default.default.createElement(
+  )), /* @__PURE__ */ React__default.default.createElement(
     "style",
     {
       dangerouslySetInnerHTML: {
@@ -2093,6 +2124,10 @@ const listCss = `
   padding-right: 8px;
 }
 
+.ant-list .plasmic-list-item {
+  align-items: stretch;
+}
+
 .plasmic-list-item--clickable:hover {
   background-color: #8881;
 }
@@ -2142,7 +2177,7 @@ function RichList(props) {
     pageSize = 10,
     hideSearch,
     rowKey,
-    pagination,
+    pagination = true,
     onRowClick
   } = _a; __objRest(_a, [
     "data",
@@ -2252,7 +2287,7 @@ function RichList(props) {
           var _a3;
           return (_a3 = linkWrapper == null ? void 0 : linkWrapper(x)) != null ? _a3 : x;
         }
-        return type === "grid" ? /* @__PURE__ */ React__default.default.createElement(antd.List.Item, null, maybeLink(
+        return type === "grid" ? /* @__PURE__ */ React__default.default.createElement(antd.List.Item, { className: "plasmic-list-item" }, maybeLink(
           /* @__PURE__ */ React__default.default.createElement(
             antd.Card,
             {
@@ -2270,6 +2305,7 @@ function RichList(props) {
             {
               actions,
               className: classNames__default.default({
+                "plasmic-list-item": true,
                 "plasmic-list-item--clickable": hasLink
               })
             },
@@ -2363,7 +2399,7 @@ function useRoleDefinitions(data, props) {
     const schema = data == null ? void 0 : data.schema;
     const schemaMap = new Map((_a = data == null ? void 0 : data.schema) == null ? void 0 : _a.fields.map((f) => [f.id, f]));
     if (!data || !schema) {
-      return { normalized: [], roleConfigs: {}, finalRoles: {} };
+      return { normalized: [], finalRoles: {} };
     }
     function tagFieldConfigs(role) {
       var _a2;
@@ -2377,27 +2413,33 @@ function useRoleDefinitions(data, props) {
         return [];
       }
     }
-    const { mergedFields, minimalFullLengthFields } = dataSources.deriveFieldConfigs(
-      [
-        ...tagFieldConfigs("image"),
-        ...tagFieldConfigs("content"),
-        ...tagFieldConfigs("title"),
-        ...tagFieldConfigs("beforeTitle"),
-        ...tagFieldConfigs("afterTitle"),
-        ...tagFieldConfigs("subtitle")
-      ],
-      schema,
-      (field) => __spreadValues$1(__spreadValues$1({}, defaultColumnConfig()), field && {
-        key: field.id,
-        fieldId: field.id,
-        title: field.label || field.id,
-        // undefined means not yet determined in this routine, not 'unset'
-        role: void 0,
-        expr: (currentItem) => currentItem[field.id]
-      })
-    );
-    const normalized = mergedFields;
-    if (data.data.length > 0 && !mergedFields.some((field) => field.role === "image")) {
+    const specifiedFieldsPartial = [
+      ...tagFieldConfigs("image"),
+      ...tagFieldConfigs("content"),
+      ...tagFieldConfigs("title"),
+      ...tagFieldConfigs("beforeTitle"),
+      ...tagFieldConfigs("afterTitle"),
+      ...tagFieldConfigs("subtitle")
+    ];
+    function doDeriveFieldConfigs(mode) {
+      return dataSources.deriveFieldConfigs(
+        mode === "defaults" ? [] : specifiedFieldsPartial,
+        schema,
+        (field) => __spreadValues$1(__spreadValues$1({}, defaultColumnConfig()), field && {
+          key: field.id,
+          fieldId: field.id,
+          title: field.label || field.id,
+          // undefined means not yet determined in this routine, not 'unset'
+          role: void 0,
+          expr: (currentItem) => currentItem[field.id]
+        })
+      );
+    }
+    const {
+      mergedFields: defaultMergedFields,
+      minimalFullLengthFields: defaultMinimalFullLengthFields
+    } = doDeriveFieldConfigs("defaults");
+    if (data.data.length > 0 && !defaultMergedFields.some((field) => field.role === "image")) {
       const sampleRows = Array.from(
         new Set(
           [0, 1, 2, 3, 4, 5, 6, 7, 8, 9].map(
@@ -2405,7 +2447,7 @@ function useRoleDefinitions(data, props) {
           )
         )
       ).map((i) => data.data[i]);
-      const imageFieldCandidates = mergedFields.filter(
+      const imageFieldCandidates = defaultMergedFields.filter(
         (field) => !field.role && sampleRows.filter(
           (row) => field.fieldId && isLikeImage(row[field.fieldId])
         ).length >= sampleRows.length / 2
@@ -2429,8 +2471,8 @@ function useRoleDefinitions(data, props) {
         imageField.role = "image";
       }
     }
-    if (!mergedFields.some((field) => field.role === "title")) {
-      const titleField = mergedFields.find(
+    if (!defaultMergedFields.some((field) => field.role === "title")) {
+      const titleField = defaultMergedFields.find(
         (field) => {
           var _a2;
           return !field.role && ((_a2 = field.fieldId) == null ? void 0 : _a2.toLowerCase().match(/^(title|name|first[ _-]?name|full[ _-]?name)$/));
@@ -2440,8 +2482,8 @@ function useRoleDefinitions(data, props) {
         titleField.role = "title";
       }
     }
-    if (!mergedFields.some((field) => field.role === "content")) {
-      const contentField = mergedFields.find(
+    if (!defaultMergedFields.some((field) => field.role === "content")) {
+      const contentField = defaultMergedFields.find(
         (field) => {
           var _a2;
           return !field.role && field.fieldId && ((_a2 = schemaMap.get(field.fieldId)) == null ? void 0 : _a2.type) === "string";
@@ -2451,19 +2493,49 @@ function useRoleDefinitions(data, props) {
         contentField.role = "content";
       }
     }
-    const roleConfigs = ensure(groupBy__default.default(mergedFields, (f) => f.role));
+    const fieldIdToDefaultRole = new Map(
+      defaultMergedFields.map((f) => [f.fieldId, f.role])
+    );
+    for (const f of defaultMinimalFullLengthFields) {
+      f.role = fieldIdToDefaultRole.get(f.fieldId);
+    }
+    const { mergedFields, minimalFullLengthFields } = doDeriveFieldConfigs("existing");
+    const minimalFullLengthFieldsWithDefaults = [
+      ...minimalFullLengthFields.filter((f) => f.role && f.role !== "unset"),
+      ...defaultMinimalFullLengthFields.filter(
+        (f) => f.role && f.role !== "unset" && !props[f.role]
+      )
+    ];
+    const mergedFieldsWithDefaults = [
+      ...mergedFields.filter((f) => f.role && f.role !== "unset"),
+      ...defaultMergedFields.filter(
+        (f) => f.role && f.role !== "unset" && !props[f.role]
+      )
+    ];
+    console.log("!!derived", {
+      minimalFullLengthFieldsWithDefaults,
+      minimalFullLengthFields,
+      defaultMinimalFullLengthFields,
+      mergedFieldsWithDefaults,
+      mergedFields,
+      defaultMergedFields,
+      props
+    });
+    const roleConfigs = ensure(
+      groupBy__default.default(mergedFieldsWithDefaults, (f) => f.role)
+    );
     const finalRoles = {};
     for (const role of roles) {
       if (role !== "unset") {
         finalRoles[role] = (_d = maybe(props[role], ensureArray)) != null ? _d : roleConfigs[role];
       }
     }
-    const fieldIdToRole = new Map(mergedFields.map((f) => [f.fieldId, f.role]));
-    for (const f of minimalFullLengthFields) {
-      f.role = fieldIdToRole.get(f.fieldId);
-    }
-    setControlContextData == null ? void 0 : setControlContextData(__spreadProps(__spreadValues$1({}, data), { mergedFields, minimalFullLengthFields }));
-    return { normalized, roleConfigs, finalRoles };
+    setControlContextData == null ? void 0 : setControlContextData(__spreadProps(__spreadValues$1({}, data), {
+      mergedFields: mergedFieldsWithDefaults,
+      minimalFullLengthFields: minimalFullLengthFieldsWithDefaults
+    }));
+    const normalized = mergedFieldsWithDefaults;
+    return { normalized, finalRoles };
   }, [fields, data, setControlContextData, rowActions]);
 }
 
@@ -2529,11 +2601,6 @@ const richListMeta = {
     padding: "16px",
     maxHeight: "100%"
   },
-  templates: {
-    grid: {
-      props: {}
-    }
-  },
   props: __spreadValues({
     data: dataProp(),
     type: {