@teselagen/ove 0.5.31-beta.2 → 0.5.31-beta.3

package/index.umd.js

@@ -9854,16 +9854,25 @@ var __async = (__this, __arguments, generator) => {
     return value;
   }, "GetIntrinsic");
   var callBind$3 = { exports: {} };
-  var GetIntrinsic$4 = getIntrinsic;
-  var $defineProperty$2 = GetIntrinsic$4("%Object.defineProperty%", true) || false;
-  if ($defineProperty$2) {
-    try {
-      $defineProperty$2({}, "a", { value: 1 });
-    } catch (e2) {
-      $defineProperty$2 = false;
+  var esDefineProperty;
+  var hasRequiredEsDefineProperty;
+  function requireEsDefineProperty() {
+    if (hasRequiredEsDefineProperty)
+      return esDefineProperty;
+    hasRequiredEsDefineProperty = 1;
+    var GetIntrinsic2 = getIntrinsic;
+    var $defineProperty2 = GetIntrinsic2("%Object.defineProperty%", true) || false;
+    if ($defineProperty2) {
+      try {
+        $defineProperty2({}, "a", { value: 1 });
+      } catch (e2) {
+        $defineProperty2 = false;
+      }
     }
+    esDefineProperty = $defineProperty2;
+    return esDefineProperty;
   }
-  var esDefineProperty = $defineProperty$2;
+  __name(requireEsDefineProperty, "requireEsDefineProperty");
   var GetIntrinsic$3 = getIntrinsic;
   var $gOPD$1 = GetIntrinsic$3("%Object.getOwnPropertyDescriptor%", true);
   if ($gOPD$1) {
@@ -9874,7 +9883,7 @@ var __async = (__this, __arguments, generator) => {
     }
   }
   var gopd$1 = $gOPD$1;
-  var $defineProperty$1 = esDefineProperty;
+  var $defineProperty$1 = requireEsDefineProperty();
   var $SyntaxError = syntax;
   var $TypeError$4 = type$1;
   var gopd = gopd$1;
@@ -9915,7 +9924,7 @@ var __async = (__this, __arguments, generator) => {
       throw new $SyntaxError("This environment does not support defining a property as non-configurable, non-writable, or non-enumerable.");
     }
   }, "defineDataProperty");
-  var $defineProperty = esDefineProperty;
+  var $defineProperty = requireEsDefineProperty();
   var hasPropertyDescriptors = /* @__PURE__ */ __name(function hasPropertyDescriptors2() {
     return !!$defineProperty;
   }, "hasPropertyDescriptors");
@@ -9984,7 +9993,7 @@ var __async = (__this, __arguments, generator) => {
     var $apply = GetIntrinsic2("%Function.prototype.apply%");
     var $call = GetIntrinsic2("%Function.prototype.call%");
     var $reflectApply = GetIntrinsic2("%Reflect.apply%", true) || bind2.call($call, $apply);
-    var $defineProperty2 = esDefineProperty;
+    var $defineProperty2 = requireEsDefineProperty();
     var $max = GetIntrinsic2("%Math.max%");
     module2.exports = /* @__PURE__ */ __name(function callBind2(originalFunction) {
       if (typeof originalFunction !== "function") {
@@ -63537,18 +63546,14 @@ ${latestSubscriptionCallbackError.current.stack}
       return /* @__PURE__ */ React$2.createElement(Icon, { className: "dt-eyeIcon", icon: "eye-open" });
     }
   };
-  const openColumn = __spreadProps(__spreadValues({}, viewColumn), {
-    render: (val2, record, rowInfo, props) => {
+  const openColumn = /* @__PURE__ */ __name(({ onDoubleClick, history }) => __spreadProps(__spreadValues({}, viewColumn), {
+    render: (val2, record, rowInfo) => {
       return /* @__PURE__ */ React$2.createElement(Tooltip, { content: "Open" }, /* @__PURE__ */ React$2.createElement(
         Button,
         {
           onClick: (e2) => {
             e2.stopPropagation();
-            props.onDoubleClick && props.onDoubleClick(
-              rowInfo.original,
-              rowInfo.index,
-              props.history
-            );
+            onDoubleClick && onDoubleClick(rowInfo.original, rowInfo.index, history);
           },
           minimal: true,
           small: true,
@@ -63557,7 +63562,7 @@ ${latestSubscriptionCallbackError.current.stack}
         }
       ));
     }
-  });
+  }), "openColumn");
   function convertSchema(schema2) {
     let schemaToUse = schema2;
     if (!schemaToUse.fields && Array.isArray(schema2)) {
@@ -75990,9 +75995,7 @@ ${latestSubscriptionCallbackError.current.stack}
       Popover,
       {
         position: "bottom",
-        onClose: () => {
-          setColumnFilterMenuOpen(false);
-        },
+        onClose: () => setColumnFilterMenuOpen(false),
         isOpen: columnFilterMenuOpen,
         modifiers: {
           preventOverflow: { enabled: true },
@@ -76659,61 +76662,60 @@ ${latestSubscriptionCallbackError.current.stack}
       }
     ));
   }, "RenderCell");
-  const RenderColumns = /* @__PURE__ */ __name((props) => {
-    const {
-      addFilters,
-      cellRenderer,
-      change: change2,
-      columns,
-      currentParams,
-      compact: compact2,
-      editableCellValue,
-      editingCell,
-      editingCellSelectAll,
-      entities,
-      expandedEntityIdMap,
-      extraCompact,
-      filters,
-      getCellHoverText,
-      isCellEditable,
-      isEntityDisabled,
-      isLocalCall,
-      isSimple,
-      isSingleSelect,
-      isSelectionARectangle,
-      noDeselectAll,
-      noSelect,
-      noUserSelect,
-      onDeselect,
-      onMultiRowSelect,
-      onRowClick,
-      onRowSelect,
-      onSingleRowSelect,
-      order: order2,
-      primarySelectedCellId,
-      reduxFormCellValidation,
-      reduxFormSelectedEntityIdMap,
-      refocusTable,
-      removeSingleFilter = noop$6,
-      schema: schema2,
-      selectedCells,
-      setEditableCellValue,
-      setEditingCell,
-      setExpandedEntityIdMap,
-      setNewParams,
-      setOrder = noop$6,
-      setSelectedCells,
-      shouldShowSubComponent,
-      startCellEdit,
-      SubComponent,
-      tableRef,
-      updateEntitiesHelper,
-      updateValidation,
-      withCheckboxes,
-      withExpandAndCollapseAllButton,
-      withFilter: _withFilter,
-      withSort = true
-    } = props;
+  const RenderColumns = /* @__PURE__ */ __name(({
+    addFilters,
+    cellRenderer,
+    change: change2,
+    columns,
+    currentParams,
+    compact: compact2,
+    editableCellValue,
+    editingCell,
+    editingCellSelectAll,
+    entities,
+    expandedEntityIdMap,
+    extraCompact,
+    filters,
+    getCellHoverText,
+    isCellEditable,
+    isEntityDisabled,
+    isLocalCall,
+    isSimple,
+    isSingleSelect,
+    isSelectionARectangle,
+    noDeselectAll,
+    noSelect,
+    noUserSelect,
+    onDeselect,
+    onMultiRowSelect,
+    onRowClick,
+    onRowSelect,
+    onSingleRowSelect,
+    order: order2,
+    primarySelectedCellId,
+    reduxFormCellValidation,
+    reduxFormSelectedEntityIdMap,
+    refocusTable,
+    removeSingleFilter = noop$6,
+    schema: schema2,
+    selectedCells,
+    setEditableCellValue,
+    setEditingCell,
+    setExpandedEntityIdMap,
+    setNewParams,
+    setOrder = noop$6,
+    setSelectedCells,
+    shouldShowSubComponent,
+    startCellEdit,
+    SubComponent,
+    tableRef,
+    updateEntitiesHelper,
+    updateValidation,
+    withCheckboxes,
+    withExpandAndCollapseAllButton,
+    withFilter: _withFilter,
+    withSort = true
+  }) => {
     const withFilter = _withFilter === void 0 ? !isSimple : _withFilter;
     const onDragEnd2 = /* @__PURE__ */ __name((cellsToSelect) => {
       const [primaryRowId, primaryCellPath] = primarySelectedCellId.split(":");
@@ -76885,13 +76887,19 @@ ${latestSubscriptionCallbackError.current.stack}
       let text2 = typeof val2 !== "string" ? row.value : val2;
       const record = row.original;
       if (column.getClipboardData) {
-        text2 = column.getClipboardData(row.value, record, row, props);
+        text2 = column.getClipboardData(row.value, record, row);
       } else if (column.getValueToFilterOn) {
-        text2 = column.getValueToFilterOn(record, props);
+        text2 = column.getValueToFilterOn(record);
       } else if (column.render) {
-        text2 = column.render(row.value, record, row, props);
+        text2 = column.render(row.value, record, row, {
+          currentParams,
+          setNewParams
+        });
       } else if (cellRenderer && cellRenderer[column.path]) {
-        text2 = cellRenderer[column.path](row.value, row.original, row, props);
+        text2 = cellRenderer[column.path](row.value, row.original, row, {
+          currentParams,
+          setNewParams
+        });
       } else if (text2) {
         text2 = reactExports.isValidElement(text2) ? text2 : String(text2);
       }
@@ -77109,17 +77117,18 @@ ${latestSubscriptionCallbackError.current.stack}
       }
       if (cellRenderer && cellRenderer[column.path]) {
         tableColumn.Cell = (row) => {
-          const val2 = cellRenderer[column.path](
-            row.value,
-            row.original,
-            row,
-            props
-          );
+          const val2 = cellRenderer[column.path](row.value, row.original, row, {
+            currentParams,
+            setNewParams
+          });
           return val2;
         };
       } else if (column.render) {
         tableColumn.Cell = (row) => {
-          const val2 = column.render(row.value, row.original, row, props);
+          const val2 = column.render(row.value, row.original, row, {
+            currentParams,
+            setNewParams
+          });
           return val2;
         };
       } else if (column.type === "timestamp") {
@@ -77307,12 +77316,13 @@ ${latestSubscriptionCallbackError.current.stack}
         // }
       ]
     }, props.defaults || {}));
-    let _schema;
-    if (isFunction$1(__schema))
-      _schema = __schema(props);
-    else
-      _schema = __schema;
-    const convertedSchema = convertSchema(_schema);
+    const _schema = reactExports.useMemo(() => {
+      if (isFunction$1(__schema))
+        return __schema(props);
+      else
+        return __schema;
+    }, [__schema, props]);
+    const convertedSchema = reactExports.useMemo(() => convertSchema(_schema), [_schema]);
     if (isLocalCall) {
       if (!noForm && (!formName || formName === "tgDataTable")) {
         throw new Error(
@@ -77420,6 +77430,9 @@ ${latestSubscriptionCallbackError.current.stack}
       }
       return {};
     }, [
+      props.entities,
+      props.noOrderError,
+      props.isCodeModel,
       convertedSchema,
       currentParams,
       doNotCoercePageSize,
@@ -77454,7 +77467,7 @@ ${latestSubscriptionCallbackError.current.stack}
       doNotShowEmptyRows,
       doNotValidateUntouchedRows,
       editingCellSelectAll,
-      entities: __origEntities = [],
+      entities: _origEntities = [],
       entitiesAcrossPages: _entitiesAcrossPages,
       entityCount,
       errorParsingUrlString,
@@ -77535,10 +77548,11 @@ ${latestSubscriptionCallbackError.current.stack}
       withSort,
       withTitle = !isSimple
     } = props;
-    const _origEntities = useDeepEqualMemo(__origEntities);
-    const entities = useDeepEqualMemo(
-      ((reduxFormEntities == null ? void 0 : reduxFormEntities.length) ? reduxFormEntities : _origEntities) || []
+    const _entities = reactExports.useMemo(
+      () => ((reduxFormEntities == null ? void 0 : reduxFormEntities.length) ? reduxFormEntities : _origEntities) || [],
+      [_origEntities, reduxFormEntities]
     );
+    const entities = useDeepEqualMemo(_entities);
     const entitiesAcrossPages = useDeepEqualMemo(_entitiesAcrossPages);
     reactExports.useEffect(() => {
       if (change2) {
@@ -77575,12 +77589,15 @@ ${latestSubscriptionCallbackError.current.stack}
       withDisplayOptions
     ]);
     const schema2 = reactExports.useMemo(() => {
-      const schema22 = convertSchema(_schema);
+      const schema22 = convertedSchema;
       if (isViewable) {
         schema22.fields = [viewColumn, ...schema22.fields];
       }
       if (isOpenable) {
-        schema22.fields = [openColumn, ...schema22.fields];
+        schema22.fields = [
+          openColumn({ onDoubleClick, history }),
+          ...schema22.fields
+        ];
       }
       schema22.fields = schema22.fields.map((field) => {
         if (field.placementPath) {
@@ -77642,13 +77659,15 @@ ${latestSubscriptionCallbackError.current.stack}
       }
       return schema22;
     }, [
-      _schema,
       cellRenderer,
+      convertedSchema,
       entities,
+      history,
       isInfinite,
       isOpenable,
       isSimple,
       isViewable,
+      onDoubleClick,
       showForcedHiddenColumns,
       tableConfig.columnOrderings,
       tableConfig.fieldOptions,
@@ -79473,7 +79492,7 @@ ${latestSubscriptionCallbackError.current.stack}
       return entities;
     }, [entities, onlyShowRowsWErrors, reduxFormCellValidation]);
     const renderColumns = reactExports.useMemo(
-      () => RenderColumns(__spreadProps(__spreadValues({}, props), {
+      () => RenderColumns({
         addFilters,
         cellRenderer,
         change: change2,
@@ -79526,7 +79545,7 @@ ${latestSubscriptionCallbackError.current.stack}
         withExpandAndCollapseAllButton,
         withFilter,
         withSort
-      })),
+      }),
       // eslint-disable-next-line react-hooks/exhaustive-deps
       [
         SubComponent,
@@ -146276,7 +146295,7 @@ Part of ${annotation.translationType} Translation from BPs ${annotation.start +
   }
   __name(showFileDialog, "showFileDialog");
   const name = "@teselagen/ove";
-  const version = "0.5.31-beta.1";
+  const version = "0.5.31-beta.2";
   const main = "./src/index.js";
   const type = "module";
   const exports$1 = {
@@ -156806,42 +156825,19 @@ Part of ${annotation.translationType} Translation from BPs ${annotation.start +
   };
   __name(_ComponentToPrint, "ComponentToPrint");
   let ComponentToPrint = _ComponentToPrint;
-  const sizeSchema = {
+  const sizeSchema = /* @__PURE__ */ __name((isProtein2) => ({
     path: "size",
     type: "number",
-    render: (val2, _record, i2, props) => {
-      const record = props.isProtein ? convertDnaCaretPositionOrRangeToAA(_record) : _record;
+    render: (val2, _record) => {
+      const record = isProtein2 ? convertDnaCaretPositionOrRangeToAA(_record) : _record;
       const base1Range = convertRangeTo1Based(record);
       const hasJoinedLocations = record.locations && record.locations.length > 1;
-      return /* @__PURE__ */ React$2.createElement("span", null, props.isProtein ? Math.floor(val2 / 3) : val2, " ", /* @__PURE__ */ React$2.createElement("span", { style: { fontSize: 10 } }, hasJoinedLocations ? record.locations.map((loc, i22) => {
+      return /* @__PURE__ */ React$2.createElement("span", null, isProtein2 ? Math.floor(val2 / 3) : val2, " ", /* @__PURE__ */ React$2.createElement("span", { style: { fontSize: 10 } }, hasJoinedLocations ? record.locations.map((loc, i2) => {
         const base1Range2 = convertRangeTo1Based(loc);
-        return /* @__PURE__ */ React$2.createElement("span", { key: i22 }, "(", base1Range2.start, "-", base1Range2.end, ")");
+        return /* @__PURE__ */ React$2.createElement("span", { key: i2 }, "(", base1Range2.start, "-", base1Range2.end, ")");
       }) : /* @__PURE__ */ React$2.createElement("span", null, "(", base1Range.start, "-", base1Range.end, ")")));
     }
-  };
-  const schema$2 = {
-    fields: [
-      // ...(noColor
-      //   ? []
-      //   : [
-      //       {
-      //         path: "color",
-      //         type: "string",
-      //         render: color => {
-      //           return (
-      //             <ColorPickerPopover>
-      //               <div style={{ height: 20, width: 20, background: color }} />
-      //             </ColorPickerPopover>
-      //           );
-      //         }
-      //       }
-      //     ]),
-      { path: "name", type: "string" },
-      // ...(noType ? [] : [{ path: "type", type: "string" }]),
-      sizeSchema,
-      { path: "strand", type: "string" }
-    ]
-  };
+  }), "sizeSchema");
   const _RemoveDuplicatesDialog = class _RemoveDuplicatesDialog extends React$2.Component {
     constructor() {
       super(...arguments);
@@ -156887,6 +156883,29 @@ Part of ${annotation.translationType} Translation from BPs ${annotation.start +
     render() {
       const { duplicatesToRemoveSelectedEntities, hideModal, type: type2 } = this.props;
       const selectedIds = this.state.dups.map((d2) => d2.id);
+      const schema2 = {
+        fields: [
+          // ...(noColor
+          //   ? []
+          //   : [
+          //       {
+          //         path: "color",
+          //         type: "string",
+          //         render: color => {
+          //           return (
+          //             <ColorPickerPopover>
+          //               <div style={{ height: 20, width: 20, background: color }} />
+          //             </ColorPickerPopover>
+          //           );
+          //         }
+          //       }
+          //     ]),
+          { path: "name", type: "string" },
+          // ...(noType ? [] : [{ path: "type", type: "string" }]),
+          sizeSchema(this.props.isProtein),
+          { path: "strand", type: "string" }
+        ]
+      };
       return /* @__PURE__ */ React$2.createElement("div", { className: classNames$1(DIALOG_BODY, "tg-min-width-dialog") }, /* @__PURE__ */ React$2.createElement(
         WrappedDT,
         {
@@ -156904,7 +156923,7 @@ Part of ${annotation.translationType} Translation from BPs ${annotation.start +
           withSearch: false,
           hideSelectedCount: true,
           isInfinite: true,
-          schema: schema$2,
+          schema: schema2,
           entities: this.state.dups
         }
       ), /* @__PURE__ */ React$2.createElement(
@@ -166122,13 +166141,38 @@ ${seqDataToCopy}\r
           });
         }, "onRowSelect"));
         this.commands = getCommands(this);
+      }
+      render() {
+        var _a2;
+        const {
+          readOnly: readOnly2,
+          annotations = {},
+          annotationVisibility: annotationVisibility2,
+          sequenceLength,
+          selectionLayer: selectionLayer2,
+          sequence: sequence2,
+          isProtein: isProtein2,
+          allPartTags,
+          annotationPropertiesSelectedEntities: _annotationPropertiesSelectedEntities,
+          selectedAnnotationId
+        } = this.props;
+        const annotationPropertiesSelectedEntities = _annotationPropertiesSelectedEntities.filter((a2) => annotations[a2.id]);
+        const deleteAnnotation = this.props[`delete${annotationTypeUpper}`];
+        const annotationsToUse = map$3(annotations, (annotation) => {
+          return __spreadProps(__spreadValues(__spreadValues({}, annotation), annotation.strand === void 0 && {
+            strand: annotation.forward ? 1 : -1
+          }), {
+            size: getRangeLength(annotation, sequenceLength)
+          });
+        });
+        const keyedPartTags = (_a2 = getKeyedTagsAndTagOptions(allPartTags)) != null ? _a2 : {};
         this.schema = {
           fields: [
             {
               path: "name",
               type: "string",
-              render: (name2, ann, row, props2) => {
-                const checked = !props2.annotationVisibility[`${annotationType}IndividualToHide`][ann.id];
+              render: (name2, ann) => {
+                const checked = !this.props.annotationVisibility[`${annotationType}IndividualToHide`][ann.id];
                 return /* @__PURE__ */ React$2.createElement(React$2.Fragment, null, /* @__PURE__ */ React$2.createElement(
                   Icon,
                   {
@@ -166137,9 +166181,9 @@ ${seqDataToCopy}\r
                       e2.stopPropagation();
                       const upperType = startCase(annotationType);
                       if (checked) {
-                        props2[`hide${upperType}Individual`]([ann.id]);
+                        this.props[`hide${upperType}Individual`]([ann.id]);
                       } else {
-                        props2[`show${upperType}Individual`]([ann.id]);
+                        this.props[`show${upperType}Individual`]([ann.id]);
                       }
                     },
                     style: {
@@ -166157,10 +166201,10 @@ ${seqDataToCopy}\r
               {
                 path: "bases",
                 type: "string",
-                render: (bases, primer, row, props2) => {
+                render: (bases, primer) => {
                   let bps = bases;
                   if (!bases) {
-                    bps = getSequenceWithinRange(primer, props2.sequence);
+                    bps = getSequenceWithinRange(primer, this.props.sequence);
                     if (!primer.forward) {
                       bps = getReverseComplementSequenceString(bps);
                     }
@@ -166185,12 +166229,12 @@ ${seqDataToCopy}\r
                 }
               }
             ],
-            sizeSchema,
+            sizeSchema(this.props.isProtein),
             ...withTags && this.props.allPartTags ? [
               {
                 path: "tags",
                 type: "string",
-                getValueToFilterOn: (o2, { keyedPartTags }) => {
+                getValueToFilterOn: (o2) => {
                   const toRet = (o2.tags || []).map((tagId) => {
                     const tag = keyedPartTags[tagId];
                     if (!tag)
@@ -166199,7 +166243,7 @@ ${seqDataToCopy}\r
                   }).join(" ");
                   return toRet;
                 },
-                render: (tags, b3, c2, { keyedPartTags = {} }) => {
+                render: (tags) => {
                   return /* @__PURE__ */ React$2.createElement("div", { style: { display: "flex" } }, (tags || []).map((tagId, i2) => {
                     const tag = keyedPartTags[tagId];
                     if (!tag)
@@ -166212,29 +166256,6 @@ ${seqDataToCopy}\r
             { path: "strand", type: "number" }
           ]
         };
-      }
-      render() {
-        const {
-          readOnly: readOnly2,
-          annotations = {},
-          annotationVisibility: annotationVisibility2,
-          sequenceLength,
-          selectionLayer: selectionLayer2,
-          sequence: sequence2,
-          isProtein: isProtein2,
-          allPartTags,
-          annotationPropertiesSelectedEntities: _annotationPropertiesSelectedEntities,
-          selectedAnnotationId
-        } = this.props;
-        const annotationPropertiesSelectedEntities = _annotationPropertiesSelectedEntities.filter((a2) => annotations[a2.id]);
-        const deleteAnnotation = this.props[`delete${annotationTypeUpper}`];
-        const annotationsToUse = map$3(annotations, (annotation) => {
-          return __spreadProps(__spreadValues(__spreadValues({}, annotation), annotation.strand === void 0 && {
-            strand: annotation.forward ? 1 : -1
-          }), {
-            size: getRangeLength(annotation, sequenceLength)
-          });
-        });
         return /* @__PURE__ */ React$2.createElement(
           WrappedDT,
           {
@@ -166355,7 +166376,6 @@ ${seqDataToCopy}\r
             formName: "annotationProperties",
             noRouter: true,
             isProtein: isProtein2,
-            keyedPartTags: getKeyedTagsAndTagOptions(allPartTags),
             compact: true,
             isInfinite: true,
             schema: this.schema,
@@ -166718,7 +166738,7 @@ ${seqDataToCopy}\r
                 displayName: "Size (aa)",
                 type: "number"
               },
-              sizeSchema,
+              sizeSchema(this.props.isProtein),
               { path: "frame", type: "number" },
               { path: "strand", type: "number" }
             ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ove",
-  "version": "0.5.31-beta.2",
+  "version": "0.5.31-beta.3",
   "main": "./src/index.js",
   "exports": {
     ".": {
@@ -12,7 +12,7 @@
   "dependencies": {
     "@teselagen/sequence-utils": "0.3.27",
     "@teselagen/range-utils": "0.3.7",
-    "@teselagen/ui": "0.5.23-beta.6",
+    "@teselagen/ui": "0.5.23-beta.12",
     "@teselagen/file-utils": "0.3.16",
     "@teselagen/bounce-loader": "0.3.11",
     "@teselagen/bio-parsers": "0.4.22",