@teselagen/ui 0.3.41 → 0.3.43

package/index.cjs.js

@@ -18286,11 +18286,20 @@ function require_domCreate() {
   return _domCreate;
 }
 __name(require_domCreate, "require_domCreate");
-var _ie8DomDefine = !require_descriptors() && !_fails(function() {
-  return Object.defineProperty(require_domCreate()("div"), "a", { get: function() {
-    return 7;
-  } }).a != 7;
-});
+var _ie8DomDefine;
+var hasRequired_ie8DomDefine;
+function require_ie8DomDefine() {
+  if (hasRequired_ie8DomDefine)
+    return _ie8DomDefine;
+  hasRequired_ie8DomDefine = 1;
+  _ie8DomDefine = !require_descriptors() && !_fails(function() {
+    return Object.defineProperty(require_domCreate()("div"), "a", { get: function() {
+      return 7;
+    } }).a != 7;
+  });
+  return _ie8DomDefine;
+}
+__name(require_ie8DomDefine, "require_ie8DomDefine");
 var isObject$d = _isObject;
 var _toPrimitive = /* @__PURE__ */ __name(function(it, S2) {
   if (!isObject$d(it))
@@ -18310,7 +18319,7 @@ function require_objectDp() {
     return _objectDp;
   hasRequired_objectDp = 1;
   var anObject2 = _anObject;
-  var IE8_DOM_DEFINE2 = _ie8DomDefine;
+  var IE8_DOM_DEFINE2 = require_ie8DomDefine();
   var toPrimitive2 = _toPrimitive;
   var dP2 = Object.defineProperty;
   _objectDp.f = require_descriptors() ? Object.defineProperty : /* @__PURE__ */ __name(function defineProperty5(O2, P2, Attributes) {
@@ -18528,7 +18537,15 @@ var _objectKeys = Object.keys || /* @__PURE__ */ __name(function keys(O2) {
 var _objectGops = {};
 _objectGops.f = Object.getOwnPropertySymbols;
 var _objectPie = {};
-_objectPie.f = {}.propertyIsEnumerable;
+var hasRequired_objectPie;
+function require_objectPie() {
+  if (hasRequired_objectPie)
+    return _objectPie;
+  hasRequired_objectPie = 1;
+  _objectPie.f = {}.propertyIsEnumerable;
+  return _objectPie;
+}
+__name(require_objectPie, "require_objectPie");
 var defined$1 = _defined;
 var _toObject = /* @__PURE__ */ __name(function(it) {
   return Object(defined$1(it));
@@ -18542,7 +18559,7 @@ function require_objectAssign() {
   var DESCRIPTORS2 = require_descriptors();
   var getKeys2 = _objectKeys;
   var gOPS2 = _objectGops;
-  var pIE2 = _objectPie;
+  var pIE2 = require_objectPie();
   var toObject2 = _toObject;
   var IObject2 = require_iobject();
   var $assign = Object.assign;
@@ -19197,7 +19214,7 @@ var _wksDefine = /* @__PURE__ */ __name(function(name) {
 }, "_wksDefine");
 var getKeys = _objectKeys;
 var gOPS$1 = _objectGops;
-var pIE$1 = _objectPie;
+var pIE$1 = require_objectPie();
 var _enumKeys = /* @__PURE__ */ __name(function(it) {
   var result = getKeys(it);
   var getSymbols2 = gOPS$1.f;
@@ -19238,12 +19255,12 @@ _objectGopnExt.f = /* @__PURE__ */ __name(function getOwnPropertyNames2(it) {
   return windowNames && toString$5.call(it) == "[object Window]" ? getWindowNames(it) : gOPN$1(toIObject$2(it));
 }, "getOwnPropertyNames");
 var _objectGopd = {};
-var pIE = _objectPie;
+var pIE = require_objectPie();
 var createDesc$1 = _propertyDesc;
 var toIObject$1 = _toIobject;
 var toPrimitive$1 = _toPrimitive;
 var has$6 = _has;
-var IE8_DOM_DEFINE = _ie8DomDefine;
+var IE8_DOM_DEFINE = require_ie8DomDefine();
 var gOPD$2 = Object.getOwnPropertyDescriptor;
 _objectGopd.f = require_descriptors() ? gOPD$2 : /* @__PURE__ */ __name(function getOwnPropertyDescriptor(O2, P2) {
   O2 = toIObject$1(O2);
@@ -19418,7 +19435,7 @@ if (!USE_NATIVE) {
   $GOPD.f = $getOwnPropertyDescriptor;
   $DP.f = $defineProperty;
   _objectGopn.f = gOPNExt.f = $getOwnPropertyNames;
-  _objectPie.f = $propertyIsEnumerable;
+  require_objectPie().f = $propertyIsEnumerable;
   $GOPS.f = $getOwnPropertySymbols;
   if (DESCRIPTORS && !_library) {
     redefine(ObjectProto, "propertyIsEnumerable", $propertyIsEnumerable);
@@ -55810,6 +55827,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
@@ -56668,13 +56694,14 @@ const _DataTable = class _DataTable extends React$1.Component {
     }, "formatAndValidateEntities"));
     __publicField(this, "formatAndValidateTableInitial", /* @__PURE__ */ __name(() => {
       const {
-        _origEntities: entities,
+        _origEntities,
+        entities,
         initialEntities,
         change,
         reduxFormCellValidation
       } = this.props;
       const { newEnts, validationErrors } = this.formatAndValidateEntities(
-        initialEntities || entities
+        initialEntities || (entities && entities.length ? entities : _origEntities)
       );
       change("reduxFormEntities", newEnts);
       const toKeep = {};
@@ -56792,16 +56819,33 @@ const _DataTable = class _DataTable extends React$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);
@@ -56820,7 +56864,7 @@ const _DataTable = class _DataTable extends React$1.Component {
                   entity,
                   path: path2,
                   schema,
-                  newVal
+                  newVal: formatPasteData({ newVal, path: path2, schema })
                 });
                 if (error) {
                   newCellValidate[cellId] = error;
@@ -56851,8 +56895,8 @@ const _DataTable = class _DataTable extends React$1.Component {
                 const indexToPath = lodashExports.invert(pathToIndex);
                 const startCellIndex = pathToIndex[primaryCellPath];
                 pasteData.forEach((row, i) => {
-                  row.forEach((cell, j) => {
-                    if (cell) {
+                  row.forEach((newVal, j) => {
+                    if (newVal) {
                       const cellIndexToChange = startCellIndex + j;
                       const entity = entitiesToManipulate[i];
                       if (entity) {
@@ -56863,7 +56907,11 @@ const _DataTable = class _DataTable extends React$1.Component {
                             entity,
                             path: path2,
                             schema,
-                            newVal: cell
+                            newVal: formatPasteData({
+                              newVal,
+                              path: path2,
+                              schema
+                            })
                           });
                           const cellId = `${getIdOrCodeOrIndex(entity)}:${path2}`;
                           if (!newSelectedCells[cellId]) {
@@ -56973,17 +57021,11 @@ const _DataTable = class _DataTable extends React$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;
@@ -57000,14 +57042,24 @@ const _DataTable = class _DataTable extends React$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, reduxFormEntitiesUndoRedoStack = { currentVersion: 0 } } = this.props;
       const [nextState, patches, inversePatches] = cn(ents, fn4);
@@ -57026,34 +57078,35 @@ const _DataTable = class _DataTable extends React$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 && copy$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) => {
@@ -57061,10 +57114,9 @@ const _DataTable = class _DataTable extends React$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.");
@@ -57104,6 +57156,7 @@ const _DataTable = class _DataTable extends React$1.Component {
         return;
       const allRows = getAllRows(e2);
       let fullCellText = "";
+      const fullJson = [];
       lodashExports.times(selectionGrid.length, (i) => {
         const row = selectionGrid[i];
         if (fullCellText) {
@@ -57112,20 +57165,24 @@ const _DataTable = class _DataTable extends React$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);
@@ -57142,10 +57199,9 @@ const _DataTable = class _DataTable extends React$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.");
@@ -57880,6 +57936,7 @@ const _DataTable = class _DataTable extends React$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}`;
@@ -57890,6 +57947,7 @@ const _DataTable = class _DataTable extends React$1.Component {
           const dataTest = {
             "data-test": "tgCell_" + column.path
           };
+          const fullValue = (_a2 = row.original) == null ? void 0 : _a2[row.column.path];
           if (isCellEditable && isBool) {
             val = /* @__PURE__ */ React$1.createElement(
               core$5.Checkbox,
@@ -57912,6 +57970,7 @@ const _DataTable = class _DataTable extends React$1.Component {
                   GenericSelectComp,
                   __spreadProps(__spreadValues({
                     rowId,
+                    fullValue,
                     initialValue: text2
                   }, dataTest), {
                     finishEdit: (newVal, doNotStopEditing) => {
@@ -57979,6 +58038,13 @@ const _DataTable = class _DataTable extends React$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
             }),
             val
@@ -58325,8 +58391,13 @@ const _DataTable = class _DataTable extends React$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"
               }
@@ -58368,7 +58439,7 @@ const _DataTable = class _DataTable extends React$1.Component {
               {
                 key: "copySelectedRows",
                 onClick: () => {
-                  this.handleCopyRow(row);
+                  this.handleCopyRows([row]);
                 },
                 text: "Row"
               }
@@ -58614,6 +58685,10 @@ const _DataTable = class _DataTable extends React$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
           })
@@ -59630,6 +59705,20 @@ function isEntityClean(e2) {
   return isClean;
 }
 __name(isEntityClean, "isEntityClean");
+const formatPasteData = /* @__PURE__ */ __name(({ schema, newVal, path: path2 }) => {
+  const pathToField = getFieldPathToField(schema);
+  const column = pathToField[path2];
+  if (column.type === "genericSelect") {
+    if ((newVal == null ? void 0 : newVal.__genSelCol) === path2) {
+      newVal = newVal.__strVal;
+    } else {
+      newVal = void 0;
+    }
+  } else {
+    newVal = Object.hasOwn(newVal, "__strVal") ? newVal.__strVal : newVal;
+  }
+  return newVal;
+}, "formatPasteData");
 const wrapDialog = /* @__PURE__ */ __name((topLevelDialogProps = {}) => (Component) => (props) => {
   const r2 = React$1.useRef();
   const memoedHotkeys = React$1.useMemo(

package/index.es.js

@@ -18268,11 +18268,20 @@ function require_domCreate() {
   return _domCreate;
 }
 __name(require_domCreate, "require_domCreate");
-var _ie8DomDefine = !require_descriptors() && !_fails(function() {
-  return Object.defineProperty(require_domCreate()("div"), "a", { get: function() {
-    return 7;
-  } }).a != 7;
-});
+var _ie8DomDefine;
+var hasRequired_ie8DomDefine;
+function require_ie8DomDefine() {
+  if (hasRequired_ie8DomDefine)
+    return _ie8DomDefine;
+  hasRequired_ie8DomDefine = 1;
+  _ie8DomDefine = !require_descriptors() && !_fails(function() {
+    return Object.defineProperty(require_domCreate()("div"), "a", { get: function() {
+      return 7;
+    } }).a != 7;
+  });
+  return _ie8DomDefine;
+}
+__name(require_ie8DomDefine, "require_ie8DomDefine");
 var isObject$d = _isObject;
 var _toPrimitive = /* @__PURE__ */ __name(function(it, S2) {
   if (!isObject$d(it))
@@ -18292,7 +18301,7 @@ function require_objectDp() {
     return _objectDp;
   hasRequired_objectDp = 1;
   var anObject2 = _anObject;
-  var IE8_DOM_DEFINE2 = _ie8DomDefine;
+  var IE8_DOM_DEFINE2 = require_ie8DomDefine();
   var toPrimitive2 = _toPrimitive;
   var dP2 = Object.defineProperty;
   _objectDp.f = require_descriptors() ? Object.defineProperty : /* @__PURE__ */ __name(function defineProperty5(O2, P2, Attributes) {
@@ -18510,7 +18519,15 @@ var _objectKeys = Object.keys || /* @__PURE__ */ __name(function keys(O2) {
 var _objectGops = {};
 _objectGops.f = Object.getOwnPropertySymbols;
 var _objectPie = {};
-_objectPie.f = {}.propertyIsEnumerable;
+var hasRequired_objectPie;
+function require_objectPie() {
+  if (hasRequired_objectPie)
+    return _objectPie;
+  hasRequired_objectPie = 1;
+  _objectPie.f = {}.propertyIsEnumerable;
+  return _objectPie;
+}
+__name(require_objectPie, "require_objectPie");
 var defined$1 = _defined;
 var _toObject = /* @__PURE__ */ __name(function(it) {
   return Object(defined$1(it));
@@ -18524,7 +18541,7 @@ function require_objectAssign() {
   var DESCRIPTORS2 = require_descriptors();
   var getKeys2 = _objectKeys;
   var gOPS2 = _objectGops;
-  var pIE2 = _objectPie;
+  var pIE2 = require_objectPie();
   var toObject2 = _toObject;
   var IObject2 = require_iobject();
   var $assign = Object.assign;
@@ -19179,7 +19196,7 @@ var _wksDefine = /* @__PURE__ */ __name(function(name) {
 }, "_wksDefine");
 var getKeys = _objectKeys;
 var gOPS$1 = _objectGops;
-var pIE$1 = _objectPie;
+var pIE$1 = require_objectPie();
 var _enumKeys = /* @__PURE__ */ __name(function(it) {
   var result = getKeys(it);
   var getSymbols2 = gOPS$1.f;
@@ -19220,12 +19237,12 @@ _objectGopnExt.f = /* @__PURE__ */ __name(function getOwnPropertyNames2(it) {
   return windowNames && toString$5.call(it) == "[object Window]" ? getWindowNames(it) : gOPN$1(toIObject$2(it));
 }, "getOwnPropertyNames");
 var _objectGopd = {};
-var pIE = _objectPie;
+var pIE = require_objectPie();
 var createDesc$1 = _propertyDesc;
 var toIObject$1 = _toIobject;
 var toPrimitive$1 = _toPrimitive;
 var has$6 = _has;
-var IE8_DOM_DEFINE = _ie8DomDefine;
+var IE8_DOM_DEFINE = require_ie8DomDefine();
 var gOPD$2 = Object.getOwnPropertyDescriptor;
 _objectGopd.f = require_descriptors() ? gOPD$2 : /* @__PURE__ */ __name(function getOwnPropertyDescriptor(O2, P2) {
   O2 = toIObject$1(O2);
@@ -19400,7 +19417,7 @@ if (!USE_NATIVE) {
   $GOPD.f = $getOwnPropertyDescriptor;
   $DP.f = $defineProperty;
   _objectGopn.f = gOPNExt.f = $getOwnPropertyNames;
-  _objectPie.f = $propertyIsEnumerable;
+  require_objectPie().f = $propertyIsEnumerable;
   $GOPS.f = $getOwnPropertySymbols;
   if (DESCRIPTORS && !_library) {
     redefine(ObjectProto, "propertyIsEnumerable", $propertyIsEnumerable);
@@ -55792,6 +55809,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
@@ -56650,13 +56676,14 @@ const _DataTable = class _DataTable extends React__default.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 && entities.length ? entities : _origEntities)
       );
       change2("reduxFormEntities", newEnts);
       const toKeep = {};
@@ -56774,16 +56801,33 @@ const _DataTable = class _DataTable extends React__default.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);
@@ -56802,7 +56846,7 @@ const _DataTable = class _DataTable extends React__default.Component {
                   entity,
                   path: path2,
                   schema,
-                  newVal
+                  newVal: formatPasteData({ newVal, path: path2, schema })
                 });
                 if (error) {
                   newCellValidate[cellId] = error;
@@ -56833,8 +56877,8 @@ const _DataTable = class _DataTable extends React__default.Component {
                 const indexToPath = lodashExports.invert(pathToIndex);
                 const startCellIndex = pathToIndex[primaryCellPath];
                 pasteData.forEach((row, i) => {
-                  row.forEach((cell, j) => {
-                    if (cell) {
+                  row.forEach((newVal, j) => {
+                    if (newVal) {
                       const cellIndexToChange = startCellIndex + j;
                       const entity = entitiesToManipulate[i];
                       if (entity) {
@@ -56845,7 +56889,11 @@ const _DataTable = class _DataTable extends React__default.Component {
                             entity,
                             path: path2,
                             schema,
-                            newVal: cell
+                            newVal: formatPasteData({
+                              newVal,
+                              path: path2,
+                              schema
+                            })
                           });
                           const cellId = `${getIdOrCodeOrIndex(entity)}:${path2}`;
                           if (!newSelectedCells[cellId]) {
@@ -56955,17 +57003,11 @@ const _DataTable = class _DataTable extends React__default.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;
@@ -56982,14 +57024,24 @@ const _DataTable = class _DataTable extends React__default.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);
@@ -57008,34 +57060,35 @@ const _DataTable = class _DataTable extends React__default.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 && copy$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) => {
@@ -57043,10 +57096,9 @@ const _DataTable = class _DataTable extends React__default.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.");
@@ -57086,6 +57138,7 @@ const _DataTable = class _DataTable extends React__default.Component {
         return;
       const allRows = getAllRows(e2);
       let fullCellText = "";
+      const fullJson = [];
       lodashExports.times(selectionGrid.length, (i) => {
         const row = selectionGrid[i];
         if (fullCellText) {
@@ -57094,20 +57147,24 @@ const _DataTable = class _DataTable extends React__default.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);
@@ -57124,10 +57181,9 @@ const _DataTable = class _DataTable extends React__default.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.");
@@ -57862,6 +57918,7 @@ const _DataTable = class _DataTable extends React__default.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}`;
@@ -57872,6 +57929,7 @@ const _DataTable = class _DataTable extends React__default.Component {
           const dataTest = {
             "data-test": "tgCell_" + column.path
           };
+          const fullValue = (_a2 = row.original) == null ? void 0 : _a2[row.column.path];
           if (isCellEditable && isBool) {
             val = /* @__PURE__ */ React__default.createElement(
               Checkbox,
@@ -57894,6 +57952,7 @@ const _DataTable = class _DataTable extends React__default.Component {
                   GenericSelectComp,
                   __spreadProps(__spreadValues({
                     rowId,
+                    fullValue,
                     initialValue: text2
                   }, dataTest), {
                     finishEdit: (newVal, doNotStopEditing) => {
@@ -57961,6 +58020,13 @@ const _DataTable = class _DataTable extends React__default.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
             }),
             val
@@ -58307,8 +58373,13 @@ const _DataTable = class _DataTable extends React__default.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"
               }
@@ -58350,7 +58421,7 @@ const _DataTable = class _DataTable extends React__default.Component {
               {
                 key: "copySelectedRows",
                 onClick: () => {
-                  this.handleCopyRow(row);
+                  this.handleCopyRows([row]);
                 },
                 text: "Row"
               }
@@ -58596,6 +58667,10 @@ const _DataTable = class _DataTable extends React__default.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
           })
@@ -59612,6 +59687,20 @@ function isEntityClean(e2) {
   return isClean;
 }
 __name(isEntityClean, "isEntityClean");
+const formatPasteData = /* @__PURE__ */ __name(({ schema, newVal, path: path2 }) => {
+  const pathToField = getFieldPathToField(schema);
+  const column = pathToField[path2];
+  if (column.type === "genericSelect") {
+    if ((newVal == null ? void 0 : newVal.__genSelCol) === path2) {
+      newVal = newVal.__strVal;
+    } else {
+      newVal = void 0;
+    }
+  } else {
+    newVal = Object.hasOwn(newVal, "__strVal") ? newVal.__strVal : newVal;
+  }
+  return newVal;
+}, "formatPasteData");
 const wrapDialog = /* @__PURE__ */ __name((topLevelDialogProps = {}) => (Component2) => (props) => {
   const r2 = useRef();
   const memoedHotkeys = useMemo(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.3.41",
+  "version": "0.3.43",
   "main": "./src/index.js",
   "exports": {
     ".": {

package/src/DataTable/dataTableEnhancer.js

@@ -17,6 +17,15 @@ import tgFormValues from "../utils/tgFormValues";
 import getTableConfigFromStorage from "./utils/getTableConfigFromStorage";
 
 export default 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

package/src/DataTable/index.js

@@ -427,13 +427,15 @@ class DataTable extends React.Component {
   };
   formatAndValidateTableInitial = () => {
     const {
-      _origEntities: entities,
+      _origEntities,
+      entities,
       initialEntities,
       change,
       reduxFormCellValidation
     } = this.props;
     const { newEnts, validationErrors } = this.formatAndValidateEntities(
-      initialEntities || entities
+      initialEntities ||
+        (entities && entities.length ? entities : _origEntities)
     );
     change("reduxFormEntities", newEnts);
     const toKeep = {};
@@ -616,17 +618,39 @@ class DataTable extends React.Component {
         } else if (e.clipboardData && e.clipboardData.getData) {
           toPaste = e.clipboardData.getData("text/plain");
         }
-        if (toPaste.includes(",")) {
-          //try papaparsing it out as a csv if it contains commas
-          try {
-            const { data, errors } = papaparse.parse(toPaste, {
-              header: false
+        const jsonToPaste = e.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?.length && !errors?.length) {
-              pasteData = data;
+            pastedJson.push(newRow);
+          });
+          pasteData = pastedJson;
+          // try to remove the header row if it exists
+          if (
+            pasteData[0] &&
+            pasteData[0][0] &&
+            pasteData[0][0].__isHeaderCell
+          ) {
+            pasteData = pasteData.slice(1);
+          }
+        } catch (e) {
+          if (toPaste.includes(",")) {
+            //try papaparsing it out as a csv if it contains commas
+            try {
+              const { data, errors } = papaparse.parse(toPaste, {
+                header: false
+              });
+              if (data?.length && !errors?.length) {
+                pasteData = data;
+              }
+            } catch (error) {
+              console.error(`error p982qhgpf9qh`, error);
             }
-          } catch (error) {
-            console.error(`error p982qhgpf9qh`, error);
           }
         }
         pasteData = pasteData.length ? pasteData : defaultParsePaste(toPaste);
@@ -643,13 +667,14 @@ class DataTable extends React.Component {
             const entityIdToEntity = getEntityIdToEntity(entities);
             Object.keys(reduxFormSelectedCells).forEach(cellId => {
               const [rowId, path] = cellId.split(":");
+
               const entity = entityIdToEntity[rowId].e;
               delete entity._isClean;
               const { error } = editCellHelper({
                 entity,
                 path,
                 schema,
-                newVal
+                newVal: formatPasteData({ newVal, path, schema })
               });
               if (error) {
                 newCellValidate[cellId] = error;
@@ -684,8 +709,8 @@ class DataTable extends React.Component {
               const indexToPath = invert(pathToIndex);
               const startCellIndex = pathToIndex[primaryCellPath];
               pasteData.forEach((row, i) => {
-                row.forEach((cell, j) => {
-                  if (cell) {
+                row.forEach((newVal, j) => {
+                  if (newVal) {
                     const cellIndexToChange = startCellIndex + j;
                     const entity = entitiesToManipulate[i];
                     if (entity) {
@@ -696,7 +721,11 @@ class DataTable extends React.Component {
                           entity,
                           path,
                           schema,
-                          newVal: cell
+                          newVal: formatPasteData({
+                            newVal,
+                            path,
+                            schema
+                          })
                         });
                         const cellId = `${getIdOrCodeOrIndex(entity)}:${path}`;
                         if (!newSelectedCells[cellId]) {
@@ -812,18 +841,12 @@ class DataTable extends React.Component {
     const text = cellWrapper && cellWrapper.getAttribute("data-copy-text");
     const jsonText = cellWrapper && cellWrapper.getAttribute("data-copy-json");
 
-    const toRet = text || cellWrapper.textContent || "";
-    return [toRet, jsonText];
+    const textContent = text || cellWrapper.textContent || "";
+    return [textContent, jsonText];
   };
 
-  handleCopyRow = rowEl => {
-    //takes in a row element
-    const text = this.getRowCopyText(rowEl);
-    if (!text) return window.toastr.warning("No text to copy");
-    this.handleCopyHelper(text, undefined, "Row Copied");
-  };
   handleCopyColumn = (e, cellWrapper, selectedRecords) => {
-    const cellType = cellWrapper.getAttribute("data-test");
+    const specificColumn = cellWrapper.getAttribute("data-test");
     let rowElsToCopy = getAllRows(e);
     if (!rowElsToCopy) return;
     if (selectedRecords) {
@@ -834,14 +857,23 @@ class DataTable extends React.Component {
       });
     }
     if (!rowElsToCopy) return;
-    const textToCopy = map(rowElsToCopy, rowEl =>
-      this.getRowCopyText(rowEl, { cellType })
-    )
-      .filter(text => text)
-      .join("\n");
+    this.handleCopyRows(rowElsToCopy, {
+      specificColumn,
+      onFinishMsg: "Column Copied"
+    });
+  };
+  handleCopyRows = (rowElsToCopy, { specificColumn, onFinishMsg } = {}) => {
+    let textToCopy = [];
+    const jsonToCopy = [];
+    forEach(rowElsToCopy, rowEl => {
+      const [t, j] = this.getRowCopyText(rowEl, { specificColumn });
+      textToCopy.push(t);
+      jsonToCopy.push(j);
+    });
+    textToCopy = textToCopy.filter(text => text).join("\n");
     if (!textToCopy) return window.toastr.warning("No text to copy");
 
-    this.handleCopyHelper(textToCopy, undefined, "Column copied");
+    this.handleCopyHelper(textToCopy, jsonToCopy, onFinishMsg || "Row Copied");
   };
   updateEntitiesHelper = (ents, fn) => {
     const { change, reduxFormEntitiesUndoRedoStack = { currentVersion: 0 } } =
@@ -863,36 +895,41 @@ class DataTable extends React.Component {
     });
   };
 
-  getRowCopyText = (rowEl, { cellType } = {}) => {
+  getRowCopyText = (rowEl, { specificColumn } = {}) => {
     //takes in a row element
     if (!rowEl) return;
-    return flatMap(rowEl.children, cellEl => {
+    const textContent = [];
+    const jsonText = [];
+
+    forEach(rowEl.children, cellEl => {
       const cellChild = cellEl.querySelector(`[data-copy-text]`);
       if (!cellChild) {
-        if (cellType) return []; //strip it
+        if (specificColumn) return []; //strip it
         return; //just leave it blank
       }
-      if (cellType && cellChild.getAttribute("data-test") !== cellType) {
+      if (
+        specificColumn &&
+        cellChild.getAttribute("data-test") !== specificColumn
+      ) {
         return [];
       }
-      return this.getCellCopyText(cellChild);
-    }).join("\t");
-  };
+      const [t, j] = this.getCellCopyText(cellChild);
+      textContent.push(t);
+      jsonText.push(j);
+    });
 
-  handleCopyHelper = (stringToCopy, objToCopy, message) => {
-    const copyHandler = e => {
-      e.preventDefault();
+    return [flatMap(textContent).join("\t"), jsonText];
+  };
 
-      e.clipboardData.setData("application/json", JSON.stringify(objToCopy));
-      e.clipboardData.setData("text/plain", stringToCopy);
-    };
-    document.addEventListener("copy", copyHandler);
+  handleCopyHelper = (stringToCopy, jsonToCopy, message) => {
     !window.Cypress &&
       copy(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);
   };
 
@@ -900,13 +937,9 @@ class DataTable extends React.Component {
     try {
       const allRowEls = getAllRows(e);
       if (!allRowEls) return;
-      //get row elements and call this.handleCopyRow for each
-      const textToCopy = map(allRowEls, rowEl => this.getRowCopyText(rowEl))
-        .filter(text => text)
-        .join("\n");
-      if (!textToCopy) return window.toastr.warning("No text to copy");
-
-      this.handleCopyHelper(textToCopy, undefined, "Table copied");
+      this.handleCopyRows(allRowEls, {
+        onFinishMsg: "Table Copied"
+      });
     } catch (error) {
       console.error(`error:`, error);
       window.toastr.error("Error copying rows.");
@@ -946,6 +979,7 @@ class DataTable extends React.Component {
     if (firstRowIndex === undefined) return;
     const allRows = getAllRows(e);
     let fullCellText = "";
+    const fullJson = [];
     times(selectionGrid.length, i => {
       const row = selectionGrid[i];
       if (fullCellText) {
@@ -954,20 +988,24 @@ class DataTable extends React.Component {
       if (!row) {
         return;
       } else {
+        const jsonRow = [];
         // ignore header
-        const rowCopyText = this.getRowCopyText(allRows[i + 1]).split("\t");
+        let [rowCopyText, json] = this.getRowCopyText(allRows[i + 1]);
+        rowCopyText = rowCopyText.split("\t");
         times(row.length, i => {
           const cell = row[i];
           if (cell) {
             fullCellText += rowCopyText[i];
+            jsonRow.push(json[i]);
           }
           if (i !== row.length - 1 && i >= firstCellIndex) fullCellText += "\t";
         });
+        fullJson.push(jsonRow);
       }
     });
     if (!fullCellText) return window.toastr.warning("No text to copy");
 
-    this.handleCopyHelper(fullCellText, undefined, "Selected cells copied");
+    this.handleCopyHelper(fullCellText, fullJson, "Selected cells copied");
   };
 
   handleCopySelectedRows = (selectedRecords, e) => {
@@ -990,13 +1028,9 @@ class DataTable extends React.Component {
       if (!allRowEls) return;
       const rowEls = rowNumbersToCopy.map(i => allRowEls[i]);
 
-      //get row elements and call this.handleCopyRow for each const rowEls = this.getRowEls(rowNumbersToCopy)
-      const textToCopy = map(rowEls, rowEl => this.getRowCopyText(rowEl))
-        .filter(text => text)
-        .join("\n");
-      if (!textToCopy) return window.toastr.warning("No text to copy");
-
-      this.handleCopyHelper(textToCopy, undefined, "Selected rows copied");
+      this.handleCopyRows(rowEls, {
+        onFinishMsg: "Selected rows copied"
+      });
     } catch (error) {
       console.error(`error:`, error);
       window.toastr.error("Error copying rows.");
@@ -2489,6 +2523,7 @@ class DataTable extends React.Component {
         const dataTest = {
           "data-test": "tgCell_" + column.path
         };
+        const fullValue = row.original?.[row.column.path];
         if (isCellEditable && isBool) {
           val = (
             <Checkbox
@@ -2510,9 +2545,11 @@ class DataTable extends React.Component {
           if (reduxFormEditingCell === cellId) {
             if (column.type === "genericSelect") {
               const GenericSelectComp = column.GenericSelectComp;
+
               return (
                 <GenericSelectComp
                   rowId={rowId}
+                  fullValue={fullValue}
                   initialValue={text}
                   {...dataTest}
                   finishEdit={(newVal, doNotStopEditing) => {
@@ -2568,7 +2605,7 @@ class DataTable extends React.Component {
         //     return getIdOrCodeOrIndex(e, i) === rowId2;
         //   });
         // }
-
+        // if ()
         const {
           isRect,
           selectionGrid,
@@ -2577,6 +2614,7 @@ class DataTable extends React.Component {
           entityMap,
           pathToIndex
         } = this.isSelectionARectangle();
+        // const __isHeaderCell =
         return (
           <>
             <div
@@ -2589,6 +2627,15 @@ class DataTable extends React.Component {
               {...dataTest}
               className="tg-cell-wrapper"
               data-copy-text={text}
+              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: text }
+              )}
               title={title || undefined}
             >
               {val}
@@ -2992,8 +3039,13 @@ class DataTable extends React.Component {
             onClick={() => {
               //TODOCOPY: we need to make sure that the cell copy is being used by the row copy.. right now we have 2 different things going on
               //do we need to be able to copy hidden cells? It seems like it should just copy what's on the page..?
+              const specificColumn = cellWrapper.getAttribute("data-test");
+              this.handleCopyRows([cellWrapper.closest(".rt-tr")], {
+                specificColumn,
+                onFinishMsg: "Cell copied"
+              });
               const [text, jsonText] = this.getCellCopyText(cellWrapper);
-              this.handleCopyHelper(text, jsonText, "Cell copied");
+              this.handleCopyHelper(text, jsonText);
             }}
             text="Cell"
           />
@@ -3031,7 +3083,7 @@ class DataTable extends React.Component {
           <MenuItem
             key="copySelectedRows"
             onClick={() => {
-              this.handleCopyRow(row);
+              this.handleCopyRows([row]);
               // loop through each cell in the row
             }}
             text="Row"
@@ -3296,6 +3348,10 @@ class DataTable extends React.Component {
         data-test={columnTitleTextified}
         data-path={path}
         data-copy-text={columnTitleTextified}
+        data-copy-json={JSON.stringify({
+          __strVal: columnTitleTextified,
+          __isHeaderCell: true
+        })}
         className={classNames("tg-react-table-column-header", {
           "sort-active": sortUp || sortDown
         })}
@@ -3633,3 +3689,18 @@ export function isEntityClean(e) {
   });
   return isClean;
 }
+
+const formatPasteData = ({ schema, newVal, path }) => {
+  const pathToField = getFieldPathToField(schema);
+  const column = pathToField[path];
+  if (column.type === "genericSelect") {
+    if (newVal?.__genSelCol === path) {
+      newVal = newVal.__strVal;
+    } else {
+      newVal = undefined;
+    }
+  } else {
+    newVal = Object.hasOwn(newVal, "__strVal") ? newVal.__strVal : newVal;
+  }
+  return newVal;
+};