@plasmicpkgs/plasmic-rich-components 1.0.51 → 1.0.52

package/dist/field-mappings.d.ts

@@ -43,9 +43,7 @@ export declare type ColumnConfig = {
     isHidden: boolean;
     formatting: StyleConfig;
 } & (AutoSettings | NumberSettings | StringSettings | BooleanSettings);
-export declare type PartialColumnConfig = Omit<Partial<ColumnConfig>, "key"> & {
-    key: string;
-};
+export declare type PartialColumnConfig = Partial<ColumnConfig>;
 export declare function deriveFieldConfigs(specifiedFieldsPartial: PartialColumnConfig[], schema: TableSchema | undefined): {
     mergedFields: ColumnConfig[];
     minimalFullLengthFields: PartialColumnConfig[];

package/dist/plasmic-rich-components.cjs.development.js

@@ -71,37 +71,6 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   }
   return target;
 }
-function _unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor) n = o.constructor.name;
-  if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-}
-function _arrayLikeToArray(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
-}
-function _createForOfIteratorHelperLoose(o, allowArrayLike) {
-  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-  if (it) return (it = it.call(o)).next.bind(it);
-  if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-    if (it) o = it;
-    var i = 0;
-    return function () {
-      if (i >= o.length) return {
-        done: true
-      };
-      return {
-        done: false,
-        value: o[i++]
-      };
-    };
-  }
-  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 
 function useIsClient() {
   var _useState = React.useState(false),
@@ -1097,14 +1066,6 @@ var defaultColumnConfig = function defaultColumnConfig() {
 };
 function deriveFieldConfigs(specifiedFieldsPartial, schema) {
   var _schema$fields;
-  // Ugly: when adding a new item to an array from Plasmic Studio UI, no way to specify default values for the new item,
-  // so we have to do it here. The only one we need is the random key.
-  for (var _iterator = _createForOfIteratorHelperLoose(specifiedFieldsPartial), _step; !(_step = _iterator()).done;) {
-    var field = _step.value;
-    if (!field.key) {
-      field.key = mkShortId();
-    }
-  }
   var schemaFields = (_schema$fields = schema == null ? void 0 : schema.fields) != null ? _schema$fields : [];
   var fieldById = mkIdMap(schemaFields);
   var specifiedFieldIds = new Set(withoutNils(specifiedFieldsPartial.map(function (f) {
@@ -1112,6 +1073,7 @@ function deriveFieldConfigs(specifiedFieldsPartial, schema) {
   })));
   function defaultColumnConfigForField(field) {
     return _extends({}, defaultColumnConfig(), {
+      key: field.id,
       fieldId: field.id,
       title: field.label || field.id,
       expr: function expr(currentItem) {
@@ -1119,10 +1081,12 @@ function deriveFieldConfigs(specifiedFieldsPartial, schema) {
       }
     });
   }
-  var keptSpecifiedFields = specifiedFieldsPartial.flatMap(function (f) {
+  var keptSpecifiedFields = specifiedFieldsPartial.flatMap(function (f, index) {
     var fieldId = f.fieldId;
     if (!fieldId) {
-      return [_extends({}, defaultColumnConfig(), f)];
+      return [_extends({}, defaultColumnConfig(), {
+        key: index
+      }, f)];
     }
     var field = fieldById.get(fieldId);
     // Drop configs with fieldIds no longer in the data.
@@ -1223,7 +1187,6 @@ function safeRender(x) {
   return x === undefined || x === null ? "" : typeof x === "string" ? x : typeof x === "number" ? x.toString() : JSON.stringify(x);
 }
 function RichTable(props) {
-  var _data$data;
   var className = props.className,
     _props$data = props.data,
     rawData = _props$data === void 0 ? {
@@ -1237,6 +1200,8 @@ function RichTable(props) {
         }]
       }
     } : _props$data,
+    _props$pagination = props.pagination,
+    pagination = _props$pagination === void 0 ? true : _props$pagination,
     defaultSize = props.defaultSize,
     fields = props.fields,
     setControlContextData = props.setControlContextData,
@@ -1356,31 +1321,55 @@ function RichTable(props) {
         normalized: normalized,
         columnDefinitions: columnDefinitions
       };
-    }, [fields, data, setControlContextData, Math.random()]),
-    columnDefinitions = _React$useMemo.columnDefinitions;
+    }, [fields, data, setControlContextData]),
+    columnDefinitions = _React$useMemo.columnDefinitions,
+    normalized = _React$useMemo.normalized;
   var actionRef = React.useRef();
+  var _useState2 = React.useState(undefined),
+    state = _useState2[0],
+    setState = _useState2[1];
+  var finalData = React.useMemo(function () {
+    var _data$data;
+    var filtered = data == null ? void 0 : (_data$data = data.data) == null ? void 0 : _data$data.filter(function (row) {
+      return fastStringify(Object.values(row)).toLowerCase().includes(search);
+    });
+    var sorted = state != null && state.sorter.column ?
+    // We use .sort() rather than sortBy to use localeCompare
+    function () {
+      var _normalized$find$expr;
+      var expr = (_normalized$find$expr = normalized.find(function (cconfig) {
+        var _state$sorter$column;
+        return cconfig.key === (state == null ? void 0 : (_state$sorter$column = state.sorter.column) == null ? void 0 : _state$sorter$column.key);
+      }).expr) != null ? _normalized$find$expr : function (x) {
+        return x;
+      };
+      return (filtered != null ? filtered : []).sort(function (aa, bb) {
+        var _expr, _expr2;
+        var a = (_expr = expr(aa)) != null ? _expr : null,
+          b = (_expr2 = expr(bb)) != null ? _expr2 : null;
+        // Default nil to '' here because A < null < z which is weird.
+        return typeof a === "string" ? a.localeCompare(b != null ? b : "") : typeof b === "string" ? -b.localeCompare(a != null ? a : "") : a - b;
+      });
+    }() : filtered;
+    var reversed = (state == null ? void 0 : state.sorter.order) === "descend" ? sorted == null ? void 0 : sorted.reverse() : sorted;
+    return reversed;
+  }, [data, normalized, state, search]);
   var isClient = useIsClient();
   if (!isClient) {
     return null;
   }
-  // return <NestedTest {...{ fields }} />;
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(proComponents.ProTable, {
     actionRef: actionRef,
     className: className,
     columns: columnDefinitions,
-    dataSource: data == null ? void 0 : (_data$data = data.data) == null ? void 0 : _data$data.filter(function (row) {
-      return fastStringify(Object.values(row)).toLowerCase().includes(search);
-    }),
+    onChange: function onChange(_pagination, _filters, sorter, _extra) {
+      setState({
+        sorter: sorter
+      });
+    },
+    dataSource: finalData,
     rowKey: "id",
     defaultSize: defaultSize,
-    // request={() =>
-    //   Promise.resolve({
-    //     data: data?.data?.filter((row) =>
-    //       fastStringify(row).toLowerCase().includes(search)
-    //     ),
-    //     success: true,
-    //   })
-    // }
     editable: {
       type: "multiple"
     },
@@ -1392,12 +1381,12 @@ function RichTable(props) {
       reload: false,
       density: !hideDensity
     },
-    pagination: {
+    pagination: pagination ? {
       pageSize: pageSize,
       onChange: function onChange(page) {
         return console.log(page);
       }
-    },
+    } : false,
     dateFormatter: "string",
     headerTitle: title,
     toolbar: {
@@ -1531,11 +1520,6 @@ var dataTableMeta = {
       options: ["large", "middle", "small"],
       defaultValueHint: "large"
     },
-    // TODO
-    // pagination: {
-    //   type: "boolean",
-    //   defaultValueHint: true,
-    // },
     pageSize: {
       type: "number",
       defaultValueHint: 20
@@ -1615,6 +1599,11 @@ var dataTableMeta = {
         }
       }
     },
+    pagination: {
+      type: "boolean",
+      advanced: true,
+      defaultValueHint: true
+    },
     hideSearch: {
       type: "boolean",
       advanced: true