@teselagen/ove 0.3.52 → 0.3.54

package/index.es.js

@@ -11341,10 +11341,10 @@ function m$1(n2, r2) {
   tn[n2] || (tn[n2] = r2);
 }
 __name(m$1, "m$1");
-function _$2() {
+function _$1() {
   return U;
 }
-__name(_$2, "_$2");
+__name(_$1, "_$1");
 function j$1(n2, r2) {
   r2 && (b$1("Patches"), n2.u = [], n2.s = [], n2.v = r2);
 }
@@ -11438,12 +11438,12 @@ function E(n2) {
 __name(E, "E");
 function N(n2, r2, t2) {
   var e2 = s(r2) ? b$1("MapSet").F(r2, t2) : v$1(r2) ? b$1("MapSet").T(r2, t2) : n2.O ? function(n3, r3) {
-    var t3 = Array.isArray(n3), e3 = { i: t3 ? 1 : 0, A: r3 ? r3.A : _$2(), P: false, I: false, R: {}, l: r3, t: n3, k: null, o: null, j: null, C: false }, i = e3, o2 = en;
+    var t3 = Array.isArray(n3), e3 = { i: t3 ? 1 : 0, A: r3 ? r3.A : _$1(), P: false, I: false, R: {}, l: r3, t: n3, k: null, o: null, j: null, C: false }, i = e3, o2 = en;
     t3 && (i = [e3], o2 = on$1);
     var u2 = Proxy.revocable(i, o2), a2 = u2.revoke, f2 = u2.proxy;
     return e3.k = f2, e3.j = a2, f2;
   }(r2, t2) : b$1("ES5").J(r2, t2);
-  return (t2 ? t2.A : _$2()).p.push(e2), e2;
+  return (t2 ? t2.A : _$1()).p.push(e2), e2;
 }
 __name(N, "N");
 function R(e2) {
@@ -17720,7 +17720,6 @@ lodash.exports;
   }).call(commonjsGlobal);
 })(lodash, lodash.exports);
 var lodashExports = lodash.exports;
-const _$1 = /* @__PURE__ */ getDefaultExportFromCjs(lodashExports);
 function _extends$q() {
   _extends$q = Object.assign ? Object.assign.bind() : function(target) {
     for (var i = 1; i < arguments.length; i++) {
@@ -55601,6 +55600,15 @@ const openColumn = __spreadProps(__spreadValues({}, viewColumn), {
   }
 });
 const dataTableEnhancer = compose(
+  // maybe we need this in some cases?
+  // tgFormValues("reduxFormEntities"),
+  // withProps(props => {
+  //   const entities = props.reduxFormEntities || props.entities;
+  //   return {
+  //     _origEntities: props.entities,
+  //     entities
+  //   };
+  // }),
   //connect to withTableParams here in the dataTable component so that, in the case that the table is not manually connected,
   withTableParams({
     isLocalCall: true
@@ -56459,13 +56467,14 @@ const _DataTable = class _DataTable extends React__default$1.Component {
     }, "formatAndValidateEntities"));
     __publicField(this, "formatAndValidateTableInitial", /* @__PURE__ */ __name(() => {
       const {
-        _origEntities: entities,
+        _origEntities,
+        entities,
         initialEntities,
         change: change2,
         reduxFormCellValidation
       } = this.props;
       const { newEnts, validationErrors } = this.formatAndValidateEntities(
-        initialEntities || entities
+        initialEntities || entities || _origEntities
       );
       change2("reduxFormEntities", newEnts);
       const toKeep = {};
@@ -56583,16 +56592,33 @@ const _DataTable = class _DataTable extends React__default$1.Component {
           } else if (e2.clipboardData && e2.clipboardData.getData) {
             toPaste = e2.clipboardData.getData("text/plain");
           }
-          if (toPaste.includes(",")) {
-            try {
-              const { data, errors } = papaparse.parse(toPaste, {
-                header: false
+          const jsonToPaste = e2.clipboardData.getData("application/json");
+          try {
+            const pastedJson = [];
+            JSON.parse(jsonToPaste).forEach((row) => {
+              const newRow = [];
+              Object.values(row).forEach((cell) => {
+                const cellVal = JSON.parse(cell);
+                newRow.push(cellVal);
               });
-              if ((data == null ? void 0 : data.length) && !(errors == null ? void 0 : errors.length)) {
-                pasteData = data;
+              pastedJson.push(newRow);
+            });
+            pasteData = pastedJson;
+            if (pasteData[0] && pasteData[0][0] && pasteData[0][0].__isHeaderCell) {
+              pasteData = pasteData.slice(1);
+            }
+          } catch (e22) {
+            if (toPaste.includes(",")) {
+              try {
+                const { data, errors } = papaparse.parse(toPaste, {
+                  header: false
+                });
+                if ((data == null ? void 0 : data.length) && !(errors == null ? void 0 : errors.length)) {
+                  pasteData = data;
+                }
+              } catch (error) {
+                console.error(`error p982qhgpf9qh`, error);
               }
-            } catch (error) {
-              console.error(`error p982qhgpf9qh`, error);
             }
           }
           pasteData = pasteData.length ? pasteData : defaultParsePaste(toPaste);
@@ -56611,7 +56637,7 @@ const _DataTable = class _DataTable extends React__default$1.Component {
                   entity,
                   path: path2,
                   schema: schema2,
-                  newVal: newVal2
+                  newVal: formatPasteData({ newVal: newVal2, path: path2, schema: schema2 })
                 });
                 if (error) {
                   newCellValidate[cellId] = error;
@@ -56642,8 +56668,8 @@ const _DataTable = class _DataTable extends React__default$1.Component {
                 const indexToPath = lodashExports.invert(pathToIndex);
                 const startCellIndex = pathToIndex[primaryCellPath];
                 pasteData.forEach((row, i) => {
-                  row.forEach((cell, j) => {
-                    if (cell) {
+                  row.forEach((newVal2, j) => {
+                    if (newVal2) {
                       const cellIndexToChange = startCellIndex + j;
                       const entity = entitiesToManipulate[i];
                       if (entity) {
@@ -56654,7 +56680,11 @@ const _DataTable = class _DataTable extends React__default$1.Component {
                             entity,
                             path: path2,
                             schema: schema2,
-                            newVal: cell
+                            newVal: formatPasteData({
+                              newVal: newVal2,
+                              path: path2,
+                              schema: schema2
+                            })
                           });
                           const cellId = `${getIdOrCodeOrIndex(entity)}:${path2}`;
                           if (!newSelectedCells[cellId]) {
@@ -56764,17 +56794,11 @@ const _DataTable = class _DataTable extends React__default$1.Component {
     __publicField(this, "getCellCopyText", /* @__PURE__ */ __name((cellWrapper) => {
       const text2 = cellWrapper && cellWrapper.getAttribute("data-copy-text");
       const jsonText = cellWrapper && cellWrapper.getAttribute("data-copy-json");
-      const toRet = text2 || cellWrapper.textContent || "";
-      return [toRet, jsonText];
+      const textContent = text2 || cellWrapper.textContent || "";
+      return [textContent, jsonText];
     }, "getCellCopyText"));
-    __publicField(this, "handleCopyRow", /* @__PURE__ */ __name((rowEl) => {
-      const text2 = this.getRowCopyText(rowEl);
-      if (!text2)
-        return window.toastr.warning("No text to copy");
-      this.handleCopyHelper(text2, void 0, "Row Copied");
-    }, "handleCopyRow"));
     __publicField(this, "handleCopyColumn", /* @__PURE__ */ __name((e2, cellWrapper, selectedRecords) => {
-      const cellType = cellWrapper.getAttribute("data-test");
+      const specificColumn = cellWrapper.getAttribute("data-test");
       let rowElsToCopy = getAllRows(e2);
       if (!rowElsToCopy)
         return;
@@ -56791,14 +56815,24 @@ const _DataTable = class _DataTable extends React__default$1.Component {
       }
       if (!rowElsToCopy)
         return;
-      const textToCopy = lodashExports.map(
-        rowElsToCopy,
-        (rowEl) => this.getRowCopyText(rowEl, { cellType })
-      ).filter((text2) => text2).join("\n");
+      this.handleCopyRows(rowElsToCopy, {
+        specificColumn,
+        onFinishMsg: "Column Copied"
+      });
+    }, "handleCopyColumn"));
+    __publicField(this, "handleCopyRows", /* @__PURE__ */ __name((rowElsToCopy, { specificColumn, onFinishMsg } = {}) => {
+      let textToCopy = [];
+      const jsonToCopy = [];
+      lodashExports.forEach(rowElsToCopy, (rowEl) => {
+        const [t2, j] = this.getRowCopyText(rowEl, { specificColumn });
+        textToCopy.push(t2);
+        jsonToCopy.push(j);
+      });
+      textToCopy = textToCopy.filter((text2) => text2).join("\n");
       if (!textToCopy)
         return window.toastr.warning("No text to copy");
-      this.handleCopyHelper(textToCopy, void 0, "Column copied");
-    }, "handleCopyColumn"));
+      this.handleCopyHelper(textToCopy, jsonToCopy, onFinishMsg || "Row Copied");
+    }, "handleCopyRows"));
     __publicField(this, "updateEntitiesHelper", /* @__PURE__ */ __name((ents, fn4) => {
       const { change: change2, reduxFormEntitiesUndoRedoStack = { currentVersion: 0 } } = this.props;
       const [nextState, patches, inversePatches] = cn(ents, fn4);
@@ -56817,34 +56851,35 @@ const _DataTable = class _DataTable extends React__default$1.Component {
         }
       }));
     }, "updateEntitiesHelper"));
-    __publicField(this, "getRowCopyText", /* @__PURE__ */ __name((rowEl, { cellType } = {}) => {
+    __publicField(this, "getRowCopyText", /* @__PURE__ */ __name((rowEl, { specificColumn } = {}) => {
       if (!rowEl)
         return;
-      return lodashExports.flatMap(rowEl.children, (cellEl) => {
+      const textContent = [];
+      const jsonText = [];
+      lodashExports.forEach(rowEl.children, (cellEl) => {
         const cellChild = cellEl.querySelector(`[data-copy-text]`);
         if (!cellChild) {
-          if (cellType)
+          if (specificColumn)
             return [];
           return;
         }
-        if (cellType && cellChild.getAttribute("data-test") !== cellType) {
+        if (specificColumn && cellChild.getAttribute("data-test") !== specificColumn) {
           return [];
         }
-        return this.getCellCopyText(cellChild);
-      }).join("	");
+        const [t2, j] = this.getCellCopyText(cellChild);
+        textContent.push(t2);
+        jsonText.push(j);
+      });
+      return [lodashExports.flatMap(textContent).join("	"), jsonText];
     }, "getRowCopyText"));
-    __publicField(this, "handleCopyHelper", /* @__PURE__ */ __name((stringToCopy, objToCopy, message) => {
-      const copyHandler = /* @__PURE__ */ __name((e2) => {
-        e2.preventDefault();
-        e2.clipboardData.setData("application/json", JSON.stringify(objToCopy));
-        e2.clipboardData.setData("text/plain", stringToCopy);
-      }, "copyHandler");
-      document.addEventListener("copy", copyHandler);
+    __publicField(this, "handleCopyHelper", /* @__PURE__ */ __name((stringToCopy, jsonToCopy, message) => {
       !window.Cypress && copyToClipboard$1(stringToCopy, {
+        onCopy: (clipboardData) => {
+          clipboardData.setData("application/json", JSON.stringify(jsonToCopy));
+        },
         // keep this so that pasting into spreadsheets works.
         format: "text/plain"
       });
-      document.removeEventListener("copy", copyHandler);
       window.toastr.success(message);
     }, "handleCopyHelper"));
     __publicField(this, "handleCopyTable", /* @__PURE__ */ __name((e2) => {
@@ -56852,10 +56887,9 @@ const _DataTable = class _DataTable extends React__default$1.Component {
         const allRowEls = getAllRows(e2);
         if (!allRowEls)
           return;
-        const textToCopy = lodashExports.map(allRowEls, (rowEl) => this.getRowCopyText(rowEl)).filter((text2) => text2).join("\n");
-        if (!textToCopy)
-          return window.toastr.warning("No text to copy");
-        this.handleCopyHelper(textToCopy, void 0, "Table copied");
+        this.handleCopyRows(allRowEls, {
+          onFinishMsg: "Table Copied"
+        });
       } catch (error) {
         console.error(`error:`, error);
         window.toastr.error("Error copying rows.");
@@ -56895,6 +56929,7 @@ const _DataTable = class _DataTable extends React__default$1.Component {
         return;
       const allRows = getAllRows(e2);
       let fullCellText = "";
+      const fullJson = [];
       lodashExports.times(selectionGrid.length, (i) => {
         const row = selectionGrid[i];
         if (fullCellText) {
@@ -56903,20 +56938,24 @@ const _DataTable = class _DataTable extends React__default$1.Component {
         if (!row) {
           return;
         } else {
-          const rowCopyText = this.getRowCopyText(allRows[i + 1]).split("	");
+          const jsonRow = [];
+          let [rowCopyText, json] = this.getRowCopyText(allRows[i + 1]);
+          rowCopyText = rowCopyText.split("	");
           lodashExports.times(row.length, (i2) => {
             const cell = row[i2];
             if (cell) {
               fullCellText += rowCopyText[i2];
+              jsonRow.push(json[i2]);
             }
             if (i2 !== row.length - 1 && i2 >= firstCellIndex)
               fullCellText += "	";
           });
+          fullJson.push(jsonRow);
         }
       });
       if (!fullCellText)
         return window.toastr.warning("No text to copy");
-      this.handleCopyHelper(fullCellText, void 0, "Selected cells copied");
+      this.handleCopyHelper(fullCellText, fullJson, "Selected cells copied");
     }, "handleCopySelectedCells"));
     __publicField(this, "handleCopySelectedRows", /* @__PURE__ */ __name((selectedRecords, e2) => {
       const { entities = [] } = computePresets(this.props);
@@ -56933,10 +56972,9 @@ const _DataTable = class _DataTable extends React__default$1.Component {
         if (!allRowEls)
           return;
         const rowEls = rowNumbersToCopy.map((i) => allRowEls[i]);
-        const textToCopy = lodashExports.map(rowEls, (rowEl) => this.getRowCopyText(rowEl)).filter((text2) => text2).join("\n");
-        if (!textToCopy)
-          return window.toastr.warning("No text to copy");
-        this.handleCopyHelper(textToCopy, void 0, "Selected rows copied");
+        this.handleCopyRows(rowEls, {
+          onFinishMsg: "Selected rows copied"
+        });
       } catch (error) {
         console.error(`error:`, error);
         window.toastr.error("Error copying rows.");
@@ -57671,6 +57709,7 @@ const _DataTable = class _DataTable extends React__default$1.Component {
         }
         const oldFunc = tableColumn.Cell;
         tableColumn.Cell = (...args) => {
+          var _a2;
           const [row] = args;
           const rowId = getIdOrCodeOrIndex(row.original, row.index);
           const cellId = `${rowId}:${row.column.path}`;
@@ -57681,6 +57720,7 @@ const _DataTable = class _DataTable extends React__default$1.Component {
           const dataTest = {
             "data-test": "tgCell_" + column.path
           };
+          const fullValue = (_a2 = row.original) == null ? void 0 : _a2[row.column.path];
           if (isCellEditable && isBool) {
             val2 = /* @__PURE__ */ React__default$1.createElement(
               Checkbox,
@@ -57703,6 +57743,7 @@ const _DataTable = class _DataTable extends React__default$1.Component {
                   GenericSelectComp,
                   __spreadProps(__spreadValues({
                     rowId,
+                    fullValue,
                     initialValue: text2
                   }, dataTest), {
                     finishEdit: (newVal2, doNotStopEditing) => {
@@ -57770,6 +57811,13 @@ const _DataTable = class _DataTable extends React__default$1.Component {
             }, dataTest), {
               className: "tg-cell-wrapper",
               "data-copy-text": text2,
+              "data-copy-json": JSON.stringify(
+                //tnw: eventually we'll parse these back out and use either the fullValue (for the generic selects) or the regular text vals for everything else
+                column.type === "genericSelect" ? {
+                  __strVal: fullValue,
+                  __genSelCol: column.path
+                } : { __strVal: text2 }
+              ),
               title: title || void 0
             }),
             val2
@@ -58116,8 +58164,13 @@ const _DataTable = class _DataTable extends React__default$1.Component {
               {
                 key: "copyCell",
                 onClick: () => {
+                  const specificColumn = cellWrapper.getAttribute("data-test");
+                  this.handleCopyRows([cellWrapper.closest(".rt-tr")], {
+                    specificColumn,
+                    onFinishMsg: "Cell copied"
+                  });
                   const [text2, jsonText] = this.getCellCopyText(cellWrapper);
-                  this.handleCopyHelper(text2, jsonText, "Cell copied");
+                  this.handleCopyHelper(text2, jsonText);
                 },
                 text: "Cell"
               }
@@ -58159,7 +58212,7 @@ const _DataTable = class _DataTable extends React__default$1.Component {
               {
                 key: "copySelectedRows",
                 onClick: () => {
-                  this.handleCopyRow(row);
+                  this.handleCopyRows([row]);
                 },
                 text: "Row"
               }
@@ -58405,6 +58458,10 @@ const _DataTable = class _DataTable extends React__default$1.Component {
           "data-test": columnTitleTextified,
           "data-path": path2,
           "data-copy-text": columnTitleTextified,
+          "data-copy-json": JSON.stringify({
+            __strVal: columnTitleTextified,
+            __isHeaderCell: true
+          }),
           className: classNames("tg-react-table-column-header", {
             "sort-active": sortUp || sortDown
           })
@@ -59421,6 +59478,20 @@ function isEntityClean(e2) {
   return isClean;
 }
 __name(isEntityClean, "isEntityClean");
+const formatPasteData = /* @__PURE__ */ __name(({ schema: schema2, newVal: newVal2, path: path2 }) => {
+  const pathToField = getFieldPathToField(schema2);
+  const column = pathToField[path2];
+  if (column.type === "genericSelect") {
+    if ((newVal2 == null ? void 0 : newVal2.__genSelCol) === path2) {
+      newVal2 = newVal2.__strVal;
+    } else {
+      newVal2 = void 0;
+    }
+  } else {
+    newVal2 = Object.hasOwn(newVal2, "__strVal") ? newVal2.__strVal : newVal2;
+  }
+  return newVal2;
+}, "formatPasteData");
 const wrapDialog = /* @__PURE__ */ __name((topLevelDialogProps = {}) => (Component2) => (props) => {
   const r2 = useRef();
   const memoedHotkeys = useMemo$1(
@@ -84910,10 +84981,9 @@ function insertSequenceDataAtPositionOrRange(_sequenceDataToInsert, _existingSeq
   let existingSequenceData = tidyUpSequenceData(_existingSequenceData, __spreadValues({
     doNotRemoveInvalidChars: true
   }, options));
-  const sequenceDataToInsert = tidyUpSequenceData(
-    _sequenceDataToInsert,
-    options
-  );
+  const sequenceDataToInsert = tidyUpSequenceData(_sequenceDataToInsert, __spreadValues({
+    topLevelSeqData: existingSequenceData
+  }, options));
   const newSequenceData = lodashExports.cloneDeep(existingSequenceData);
   const insertLength = sequenceDataToInsert.proteinSequence ? sequenceDataToInsert.proteinSequence.length * 3 : sequenceDataToInsert.sequence.length;
   let caretPosition2 = caretPositionOrRange;
@@ -104231,7 +104301,7 @@ function gffToJson(string2) {
       if (!features2[feature.seq_id])
         features2[feature.seq_id] = [];
       const attributes = feature.attributes || {};
-      const name2 = _$1.get(attributes, "ID[0]");
+      const name2 = lodashExports.get(attributes, "ID[0]");
       features2[feature.seq_id].push({
         name: name2,
         start: feature.start,
@@ -121076,8 +121146,8 @@ function Caret$2(props) {
 }
 __name(Caret$2, "Caret$2");
 const isEq = /* @__PURE__ */ __name((o1, o2) => {
-  const isEq2 = _$1.isEqualWith(o1, o2, function(val1, val2) {
-    if (_$1.isFunction(val1) && _$1.isFunction(val2)) {
+  const isEq2 = lodashExports.isEqualWith(o1, o2, function(val1, val2) {
+    if (lodashExports.isFunction(val1) && lodashExports.isFunction(val2)) {
       return val1 === val2 || val1.toString() === val2.toString();
     }
   });
@@ -125885,7 +125955,7 @@ function showFileDialog({ multiple = false, onSelect }) {
 }
 __name(showFileDialog, "showFileDialog");
 const name = "@teselagen/ove";
-const version = "0.3.51";
+const version = "0.3.53";
 const main = "./src/index.js";
 const exports$1 = {
   ".": {
@@ -130578,6 +130648,9 @@ function VectorInteractionHOC(Component2) {
             sequence: clipboardData.getData("text/plain") || e2.target.value
           };
         }
+        if (sequenceData2.isProtein && !seqDataToInsert.proteinSequence) {
+          seqDataToInsert.proteinSequence = seqDataToInsert.sequence;
+        }
         seqDataToInsert = tidyUpSequenceData(seqDataToInsert, {
           topLevelSeqData: sequenceData2,
           provideNewIdsForAnnotations: true,
@@ -148891,16 +148964,14 @@ function Ladder({
         onClick: () => __async(this, null, function* () {
           try {
             const canvas = yield import("./html2canvas.esm-65f48ee4.mjs");
-            canvas.default(document.querySelector(".ve-digest-container")).then(
-              (canvas2) => {
-                canvas2.toBlob(
-                  (blob) => navigator.clipboard.write([
-                    new window.ClipboardItem({ "image/png": blob })
-                  ])
-                );
-                window.toastr.success("Image copied to clipboard!");
-              }
-            );
+            canvas.default(document.querySelector(".ve-digest-container")).then((canvas2) => {
+              canvas2.toBlob(
+                (blob) => navigator.clipboard.write([
+                  new window.ClipboardItem({ "image/png": blob })
+                ])
+              );
+              window.toastr.success("Image copied to clipboard!");
+            });
           } catch (e2) {
             window.toastr.error(
               "Error copying the image, try just taking a screenshot instead ;)"