@teselagen/ui 0.5.23-beta.12 → 0.5.23-beta.14

package/DataTable/utils/withTableParams.d.ts

@@ -13,7 +13,7 @@
  * @property {object} defaults - tableParam defaults such as pageSize, filter, etc
  * @property {boolean} noOrderError - won't console an error if an order is not found on schema
  */
-export default function withTableParams(compOrOpts: compOrOpts, pTopLevelOpts: any): any;
+export default function withTableParams(topLevelOptions: any): any;
 /**
  * Note all these options can be passed at Design Time or at Runtime (like reduxForm())
  */

package/index.cjs.js

@@ -48405,11 +48405,12 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
   props = __spreadValues(__spreadValues({}, props), withSelectedEntities2 && typeof withSelectedEntities2 === "string" && {
     [withSelectedEntities2]: selectedEntities
   });
-  const currentParams = React$1.useMemo(() => {
+  const _currentParams = React$1.useMemo(() => {
     const tmp = (urlConnected ? getCurrentParamsFromUrl(history.location) : reduxFormQueryParams) || {};
     tmp.searchTerm = reduxFormSearchInput;
     return tmp;
   }, [history, reduxFormQueryParams, reduxFormSearchInput, urlConnected]);
+  const currentParams = useDeepEqualMemo(_currentParams);
   const tableParams = React$1.useMemo(() => {
     if (!isTableParamsConnected) {
       const updateSearch = /* @__PURE__ */ __name((val) => {
@@ -48663,7 +48664,13 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
         if (!showForcedHiddenColumns && withDisplayOptions && (isSimple || isInfinite)) {
           noValsForField = entities.every((e2) => {
             const val = get$5(e2, field.path);
-            return field.render ? !field.render(val, e2) : (cellRenderer == null ? void 0 : cellRenderer[field.path]) ? !cellRenderer[field.path](val, e2) : !val;
+            return field.render ? !field.render(val, e2, void 0, {
+              currentParams,
+              setNewParams
+            }) : (cellRenderer == null ? void 0 : cellRenderer[field.path]) ? !cellRenderer[field.path](val, e2, void 0, {
+              currentParams,
+              setNewParams
+            }) : !val;
           });
         }
         if (noValsForField) {
@@ -48707,6 +48714,7 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
   }, [
     cellRenderer,
     convertedSchema,
+    currentParams,
     entities,
     history,
     isInfinite,
@@ -48714,6 +48722,7 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
     isSimple,
     isViewable,
     onDoubleClick,
+    setNewParams,
     showForcedHiddenColumns,
     tableConfig.columnOrderings,
     tableConfig.fieldOptions,
@@ -64403,29 +64412,14 @@ const withStore = /* @__PURE__ */ __name((Component) => {
     return /* @__PURE__ */ React$1.createElement(Component, __spreadProps(__spreadValues({}, props), { store }));
   };
 }, "withStore");
-const isEq = /* @__PURE__ */ __name((o1, o2) => {
-  const isEq2 = isEqualWith(o1, o2, function(val1, val2) {
-    if (isFunction$4(val1) && isFunction$4(val2)) {
-      return val1 === val2 || val1.toString() === val2.toString();
-    }
-    if (val1 && val1.constructor && val1.constructor.name === "FiberNode")
-      return true;
-  });
-  return isEq2;
-}, "isEq");
-const pure = /* @__PURE__ */ __name((BaseComponent) => {
-  const hoc = shouldUpdate((props, nextProps) => !isEq(props, nextProps));
-  return hoc(BaseComponent);
-}, "pure");
-function withTableParams(compOrOpts, pTopLevelOpts) {
-  let topLevelOptions;
-  let Component;
-  if (!pTopLevelOpts) {
-    topLevelOptions = compOrOpts;
-  } else {
-    topLevelOptions = pTopLevelOpts;
-    Component = compOrOpts;
-  }
+const getSchema = /* @__PURE__ */ __name((options) => {
+  const { schema } = options;
+  if (isFunction$4(schema))
+    return schema(options);
+  else
+    return schema;
+}, "getSchema");
+function withTableParams(topLevelOptions) {
   const { isLocalCall = false } = topLevelOptions;
   const mapStateToProps = /* @__PURE__ */ __name((state, ownProps) => {
     var _a, _b;
@@ -64600,23 +64594,11 @@ function withTableParams(compOrOpts, pTopLevelOpts) {
     }),
     //don't use withRouter if noRouter is passed!
     branch((props) => !props.noRouter, withRouter),
-    reactRedux.connect(mapStateToProps, mapDispatchToProps, mergeProps),
-    pure
+    reactRedux.connect(mapStateToProps, mapDispatchToProps, mergeProps)
   );
-  if (Component) {
-    return toReturn(Component);
-  }
   return toReturn;
 }
 __name(withTableParams, "withTableParams");
-function getSchema(options) {
-  const { schema } = options;
-  if (isFunction$4(schema))
-    return schema(options);
-  else
-    return schema;
-}
-__name(getSchema, "getSchema");
 function showAppSpinner() {
   return renderOnDocSimple(
     /* @__PURE__ */ React$1.createElement(core.Overlay, { isOpen: true }, /* @__PURE__ */ React$1.createElement(Loading, { centeredInPage: true, loading: true }))
@@ -69420,6 +69402,20 @@ function withSelectTableRecords(_tableFormName, propName = "selectTableRecords")
   );
 }
 __name(withSelectTableRecords, "withSelectTableRecords");
+const isEq = /* @__PURE__ */ __name((o1, o2) => {
+  const isEq2 = isEqualWith(o1, o2, function(val1, val2) {
+    if (isFunction$4(val1) && isFunction$4(val2)) {
+      return val1 === val2 || val1.toString() === val2.toString();
+    }
+    if (val1 && val1.constructor && val1.constructor.name === "FiberNode")
+      return true;
+  });
+  return isEq2;
+}, "isEq");
+const pure = /* @__PURE__ */ __name((BaseComponent) => {
+  const hoc = shouldUpdate((props, nextProps) => !isEq(props, nextProps));
+  return hoc(BaseComponent);
+}, "pure");
 const isSafari = /^((?!chrome|android).)*safari/i.test(
   navigator.userAgent
 );

package/index.es.js

@@ -48387,11 +48387,12 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
   props = __spreadValues(__spreadValues({}, props), withSelectedEntities2 && typeof withSelectedEntities2 === "string" && {
     [withSelectedEntities2]: selectedEntities
   });
-  const currentParams = useMemo(() => {
+  const _currentParams = useMemo(() => {
     const tmp = (urlConnected ? getCurrentParamsFromUrl(history.location) : reduxFormQueryParams) || {};
     tmp.searchTerm = reduxFormSearchInput;
     return tmp;
   }, [history, reduxFormQueryParams, reduxFormSearchInput, urlConnected]);
+  const currentParams = useDeepEqualMemo(_currentParams);
   const tableParams = useMemo(() => {
     if (!isTableParamsConnected) {
       const updateSearch = /* @__PURE__ */ __name((val) => {
@@ -48645,7 +48646,13 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
         if (!showForcedHiddenColumns && withDisplayOptions && (isSimple || isInfinite)) {
           noValsForField = entities.every((e2) => {
             const val = get$5(e2, field.path);
-            return field.render ? !field.render(val, e2) : (cellRenderer == null ? void 0 : cellRenderer[field.path]) ? !cellRenderer[field.path](val, e2) : !val;
+            return field.render ? !field.render(val, e2, void 0, {
+              currentParams,
+              setNewParams
+            }) : (cellRenderer == null ? void 0 : cellRenderer[field.path]) ? !cellRenderer[field.path](val, e2, void 0, {
+              currentParams,
+              setNewParams
+            }) : !val;
           });
         }
         if (noValsForField) {
@@ -48689,6 +48696,7 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
   }, [
     cellRenderer,
     convertedSchema,
+    currentParams,
     entities,
     history,
     isInfinite,
@@ -48696,6 +48704,7 @@ const DataTable = /* @__PURE__ */ __name((_G) => {
     isSimple,
     isViewable,
     onDoubleClick,
+    setNewParams,
     showForcedHiddenColumns,
     tableConfig.columnOrderings,
     tableConfig.fieldOptions,
@@ -64385,29 +64394,14 @@ const withStore = /* @__PURE__ */ __name((Component2) => {
     return /* @__PURE__ */ React__default.createElement(Component2, __spreadProps(__spreadValues({}, props), { store }));
   };
 }, "withStore");
-const isEq = /* @__PURE__ */ __name((o1, o2) => {
-  const isEq2 = isEqualWith(o1, o2, function(val1, val2) {
-    if (isFunction$4(val1) && isFunction$4(val2)) {
-      return val1 === val2 || val1.toString() === val2.toString();
-    }
-    if (val1 && val1.constructor && val1.constructor.name === "FiberNode")
-      return true;
-  });
-  return isEq2;
-}, "isEq");
-const pure = /* @__PURE__ */ __name((BaseComponent) => {
-  const hoc = shouldUpdate((props, nextProps) => !isEq(props, nextProps));
-  return hoc(BaseComponent);
-}, "pure");
-function withTableParams(compOrOpts, pTopLevelOpts) {
-  let topLevelOptions;
-  let Component2;
-  if (!pTopLevelOpts) {
-    topLevelOptions = compOrOpts;
-  } else {
-    topLevelOptions = pTopLevelOpts;
-    Component2 = compOrOpts;
-  }
+const getSchema = /* @__PURE__ */ __name((options) => {
+  const { schema } = options;
+  if (isFunction$4(schema))
+    return schema(options);
+  else
+    return schema;
+}, "getSchema");
+function withTableParams(topLevelOptions) {
   const { isLocalCall = false } = topLevelOptions;
   const mapStateToProps = /* @__PURE__ */ __name((state, ownProps) => {
     var _a, _b;
@@ -64582,23 +64576,11 @@ function withTableParams(compOrOpts, pTopLevelOpts) {
     }),
     //don't use withRouter if noRouter is passed!
     branch((props) => !props.noRouter, withRouter),
-    connect(mapStateToProps, mapDispatchToProps, mergeProps),
-    pure
+    connect(mapStateToProps, mapDispatchToProps, mergeProps)
   );
-  if (Component2) {
-    return toReturn(Component2);
-  }
   return toReturn;
 }
 __name(withTableParams, "withTableParams");
-function getSchema(options) {
-  const { schema } = options;
-  if (isFunction$4(schema))
-    return schema(options);
-  else
-    return schema;
-}
-__name(getSchema, "getSchema");
 function showAppSpinner() {
   return renderOnDocSimple(
     /* @__PURE__ */ React__default.createElement(Overlay, { isOpen: true }, /* @__PURE__ */ React__default.createElement(Loading, { centeredInPage: true, loading: true }))
@@ -69402,6 +69384,20 @@ function withSelectTableRecords(_tableFormName, propName = "selectTableRecords")
   );
 }
 __name(withSelectTableRecords, "withSelectTableRecords");
+const isEq = /* @__PURE__ */ __name((o1, o2) => {
+  const isEq2 = isEqualWith(o1, o2, function(val1, val2) {
+    if (isFunction$4(val1) && isFunction$4(val2)) {
+      return val1 === val2 || val1.toString() === val2.toString();
+    }
+    if (val1 && val1.constructor && val1.constructor.name === "FiberNode")
+      return true;
+  });
+  return isEq2;
+}, "isEq");
+const pure = /* @__PURE__ */ __name((BaseComponent) => {
+  const hoc = shouldUpdate((props, nextProps) => !isEq(props, nextProps));
+  return hoc(BaseComponent);
+}, "pure");
 const isSafari = /^((?!chrome|android).)*safari/i.test(
   navigator.userAgent
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.5.23-beta.12",
+  "version": "0.5.23-beta.14",
   "main": "./src/index.js",
   "exports": {
     ".": {

package/src/DataTable/index.js

@@ -268,7 +268,7 @@ const DataTable = ({
       })
   };
 
-  const currentParams = useMemo(() => {
+  const _currentParams = useMemo(() => {
     const tmp =
       (urlConnected
         ? getCurrentParamsFromUrl(history.location) //important to use history location and not ownProps.location because for some reason the location path lags one render behind!!
@@ -278,6 +278,8 @@ const DataTable = ({
     return tmp;
   }, [history, reduxFormQueryParams, reduxFormSearchInput, urlConnected]);
 
+  const currentParams = useDeepEqualMemo(_currentParams);
+
   const tableParams = useMemo(() => {
     if (!isTableParamsConnected) {
       const updateSearch = val => {
@@ -577,9 +579,15 @@ const DataTable = ({
           noValsForField = entities.every(e => {
             const val = get(e, field.path);
             return field.render
-              ? !field.render(val, e)
+              ? !field.render(val, e, undefined, {
+                  currentParams,
+                  setNewParams
+                })
               : cellRenderer?.[field.path]
-                ? !cellRenderer[field.path](val, e)
+                ? !cellRenderer[field.path](val, e, undefined, {
+                    currentParams,
+                    setNewParams
+                  })
                 : !val;
           });
         }
@@ -639,6 +647,7 @@ const DataTable = ({
   }, [
     cellRenderer,
     convertedSchema,
+    currentParams,
     entities,
     history,
     isInfinite,
@@ -646,6 +655,7 @@ const DataTable = ({
     isSimple,
     isViewable,
     onDoubleClick,
+    setNewParams,
     showForcedHiddenColumns,
     tableConfig.columnOrderings,
     tableConfig.fieldOptions,

package/src/DataTable/utils/withTableParams.js

@@ -3,8 +3,6 @@ import { connect } from "react-redux";
 import { isFunction, set } from "lodash-es";
 import { withRouter } from "react-router-dom";
 import { branch, compose } from "recompose";
-
-import pureNoFunc from "../../utils/pureNoFunc";
 import convertSchema from "./convertSchema";
 import { getRecordsFromReduxForm } from "./withSelectedEntities";
 import {
@@ -17,6 +15,17 @@ import {
 } from "./queryParams";
 import getTableConfigFromStorage from "./getTableConfigFromStorage";
 
+/**
+ * Given the options, get the schema. This enables the user to provide
+ * a function instead of an object for the schema.
+ * @param {Object} options Merged options
+ */
+const getSchema = options => {
+  const { schema } = options;
+  if (isFunction(schema)) return schema(options);
+  else return schema;
+};
+
 /**
  *  Note all these options can be passed at Design Time or at Runtime (like reduxForm())
  *
@@ -32,15 +41,7 @@ import getTableConfigFromStorage from "./getTableConfigFromStorage";
  * @property {object} defaults - tableParam defaults such as pageSize, filter, etc
  * @property {boolean} noOrderError - won't console an error if an order is not found on schema
  */
-export default function withTableParams(compOrOpts, pTopLevelOpts) {
-  let topLevelOptions;
-  let Component;
-  if (!pTopLevelOpts) {
-    topLevelOptions = compOrOpts;
-  } else {
-    topLevelOptions = pTopLevelOpts;
-    Component = compOrOpts;
-  }
+export default function withTableParams(topLevelOptions) {
   const { isLocalCall = false } = topLevelOptions;
   const mapStateToProps = (state, ownProps) => {
     const mergedOpts = getMergedOpts(topLevelOptions, ownProps);
@@ -169,6 +170,7 @@ export default function withTableParams(compOrOpts, pTopLevelOpts) {
       },
       showEmptyColumnsByDefault
     };
+
     return mapStateProps;
     // return { ...mergedOpts, ...mapStateProps };
   };
@@ -253,22 +255,7 @@ export default function withTableParams(compOrOpts, pTopLevelOpts) {
     }),
     //don't use withRouter if noRouter is passed!
     branch(props => !props.noRouter, withRouter),
-    connect(mapStateToProps, mapDispatchToProps, mergeProps),
-    pureNoFunc
+    connect(mapStateToProps, mapDispatchToProps, mergeProps)
   );
-  if (Component) {
-    return toReturn(Component);
-  }
   return toReturn;
 }
-
-/**
- * Given the options, get the schema. This enables the user to provide
- * a function instead of an object for the schema.
- * @param {Object} options Merged options
- */
-function getSchema(options) {
-  const { schema } = options;
-  if (isFunction(schema)) return schema(options);
-  else return schema;
-}