@quintoandar-tokko/gridimagepicker 1.0.19 → 1.0.25

package/lib/ImageItem.js

@@ -19,6 +19,7 @@ require("../styles/ImageItemBlanket.css");
 require("../styles/ImageItemCover.css");
 require("../styles/ImageItemSmallElements.css");
 require("../styles/ImageItemTooltip.css");
+require("../styles/ImageItemSwitch.css");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -34,6 +35,7 @@ var ImageItem = function ImageItem(_ref) {
     handleClick = _ref.handleClick,
     handleUpdateItem = _ref.handleUpdateItem,
     onEdit = _ref.onEdit,
+    onSwitchChange = _ref.onSwitchChange,
     status = _ref.status,
     config = _ref.config,
     texts = _ref.texts,
@@ -46,12 +48,15 @@ var ImageItem = function ImageItem(_ref) {
     setNodeRef = _useSortable.setNodeRef,
     transform = _useSortable.transform,
     transition = _useSortable.transition;
-  var _useSize = (0, _useSize3["default"])(item.src, sizeFetcher),
+  var previousEditedSrc = (0, _react.useRef)(item.editedSrc);
+  var isEditedActive = item.isEditedActive;
+  var displaySrc = isEditedActive && item.editedSrc ? item.editedSrc : item.src;
+  var _useSize = (0, _useSize3["default"])(displaySrc, sizeFetcher),
     _useSize2 = _slicedToArray(_useSize, 3),
     size = _useSize2[0],
     isLoadingSize = _useSize2[1],
     isErrorSize = _useSize2[2];
-  var _useAspectRatio = (0, _useAspectRatio3["default"])(item.src),
+  var _useAspectRatio = (0, _useAspectRatio3["default"])(displaySrc),
     _useAspectRatio2 = _slicedToArray(_useAspectRatio, 5),
     height = _useAspectRatio2[0],
     width = _useAspectRatio2[1],
@@ -80,9 +85,18 @@ var ImageItem = function ImageItem(_ref) {
   var isError = item.sizeError || item.aspectRatioError || item.fetchError;
   var isFizableError = !item.fetchError && onEdit;
   var tooltipErrorText = (0, _getTooltipErrorText.getTooltipErrorText)(item, texts, onEdit);
-  var backgroundImage = item.loading || item.fetchError ? '' : "url(".concat(item.src, ")");
+  var backgroundImage = item.loading || item.fetchError ? '' : "url(".concat(displaySrc, ")");
   var unclickable = !(0, _manageItem.isItemClickable)(item, isMaxSelectableReached, itemsAreReady);
   var disabled = (0, _manageItem.isDisabledCheckbox)(item, isMaxSelectableReached);
+
+  // On (re)edit, flip back to the edited version and notify; the ref skips mount/re-renders.
+  (0, _react.useEffect)(function () {
+    if (item.editedSrc === previousEditedSrc.current) return;
+    previousEditedSrc.current = item.editedSrc;
+    if (item.editedSrc) {
+      onSwitchChange === null || onSwitchChange === void 0 || onSwitchChange(item, true);
+    }
+  }, [item.editedSrc]);
   (0, _react.useEffect)(function () {
     var handleHideTooltip = function handleHideTooltip() {
       setIsTooltipShowable(false);
@@ -189,9 +203,27 @@ var ImageItem = function ImageItem(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_icons.Icon, {
     icon: "icon-editar",
     className: "imageItemIconEdit"
-  }))), /*#__PURE__*/_react["default"].createElement(_box.Box, {
+  })), /*#__PURE__*/_react["default"].createElement(_box.Box, {
+    className: "imageItemSwitch",
+    "data-visible": Boolean(item.editedSrc) && itemsAreReady,
+    "data-cover": item.position === 1
+  }, /*#__PURE__*/_react["default"].createElement(_box.Box, {
+    className: "imageItemSwitchOption",
+    "data-active": !isEditedActive,
+    onClick: function onClick(e) {
+      e.stopPropagation();
+      onSwitchChange === null || onSwitchChange === void 0 || onSwitchChange(item, false);
+    }
+  }, texts === null || texts === void 0 ? void 0 : texts.original), /*#__PURE__*/_react["default"].createElement(_box.Box, {
+    className: "imageItemSwitchOption",
+    "data-active": isEditedActive,
+    onClick: function onClick(e) {
+      e.stopPropagation();
+      onSwitchChange === null || onSwitchChange === void 0 || onSwitchChange(item, true);
+    }
+  }, texts === null || texts === void 0 ? void 0 : texts.edited))), /*#__PURE__*/_react["default"].createElement(_box.Box, {
     className: "imageItemTooltip",
-    "data-showable": isTooltipShowable,
+    "data-showable": isTooltipShowable && Boolean(tooltipErrorText),
     __css: {
       left: tooltipPosition.left,
       top: tooltipPosition.top

package/lib/hooks/useGridImagePicker.js

@@ -10,13 +10,13 @@ var _sortable = require("@dnd-kit/sortable");
 var _manageItem = require("../utils/manageItem");
 var _manageListOfItems = require("../utils/manageListOfItems");
 var _excluded = ["id"];
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -24,17 +24,18 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function useGridImagePicker(_ref) {
-  var listOfSrc = _ref.listOfSrc,
+  var listOfImages = _ref.listOfImages,
     maxSelectablePreferenceByUser = _ref.maxSelectablePreferenceByUser,
     maxSizeInMB = _ref.maxSizeInMB,
     minAspectRatio = _ref.minAspectRatio,
     maxAspectRatio = _ref.maxAspectRatio,
-    onChange = _ref.onChange;
+    onChange = _ref.onChange,
+    onSwitchChange = _ref.onSwitchChange;
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     isDraggingActive = _useState2[0],
     setIsDraggingActive = _useState2[1];
-  var _useState3 = (0, _react.useState)(listOfSrc),
+  var _useState3 = (0, _react.useState)(listOfImages),
     _useState4 = _slicedToArray(_useState3, 2),
     initialUrlList = _useState4[0],
     setInitialUrlList = _useState4[1];
@@ -43,22 +44,41 @@ function useGridImagePicker(_ref) {
     itemNewUrl = _useState6[0],
     setItemNewUrl = _useState6[1];
   var _useState7 = (0, _react.useState)(function () {
-      return (0, _manageListOfItems.getItemsInitialState)(listOfSrc);
+      return (0, _manageListOfItems.getItemsInitialState)(listOfImages);
     }),
     _useState8 = _slicedToArray(_useState7, 2),
     items = _useState8[0],
     setItems = _useState8[1];
   (0, _react.useEffect)(function () {
-    setItemNewUrl((0, _manageListOfItems.getItemChanged)(initialUrlList, listOfSrc));
-  }, [listOfSrc]);
+    setItemNewUrl((0, _manageListOfItems.getItemChanged)(initialUrlList, listOfImages));
+  }, [listOfImages]);
   (0, _react.useEffect)(function () {
     if (!itemNewUrl) return;
     setItems(function (prevItems) {
       return (0, _manageListOfItems.getItemsWithNewUrl)(prevItems, itemNewUrl);
     });
-    setInitialUrlList(listOfSrc);
+    setInitialUrlList(listOfImages);
     setItemNewUrl(null);
   }, [itemNewUrl]);
+
+  // Sync `editedSrc` from the source list, matched by positional `id` (robust to duplicate `src` and reordering).
+  (0, _react.useEffect)(function () {
+    setItems(function (prevItems) {
+      var hasChanges = false;
+      var nextItems = prevItems.map(function (item) {
+        var source = listOfImages[item.id - 1];
+        if (!source || source.editedSrc === item.editedSrc) return item;
+        hasChanges = true;
+        // No `editedSrc` means nothing to show as edited (the flip-back lives in ImageItem).
+        var isEditedActive = source.editedSrc ? item.isEditedActive : false;
+        return _objectSpread(_objectSpread({}, item), {}, {
+          editedSrc: source.editedSrc,
+          isEditedActive: isEditedActive
+        });
+      });
+      return hasChanges ? nextItems : prevItems;
+    });
+  }, [listOfImages]);
   var maxSelectable = Math.min(maxSelectablePreferenceByUser, items.filter(function (item) {
     return !item.sizeError && !item.aspectRatioError && !item.fetchError;
   }).length);
@@ -115,6 +135,18 @@ function useGridImagePicker(_ref) {
       });
     });
   };
+
+  // Single source of truth for the shown version: stored in `items` (for `onChange`) and reported via `onSwitchChange`.
+  var handleSwitchChange = function handleSwitchChange(targetItem, isEditedActive) {
+    setItems(function (prevItems) {
+      return prevItems.map(function (item) {
+        return item.id === targetItem.id ? _objectSpread(_objectSpread({}, item), {}, {
+          isEditedActive: isEditedActive
+        }) : item;
+      });
+    });
+    onSwitchChange === null || onSwitchChange === void 0 || onSwitchChange(targetItem, isEditedActive);
+  };
   var handleDragStart = function handleDragStart() {
     setIsDraggingActive(true);
   };
@@ -142,6 +174,7 @@ function useGridImagePicker(_ref) {
     methods: {
       handleClickItem: handleClickItem,
       handleUpdateItem: handleUpdateItem,
+      handleSwitchChange: handleSwitchChange,
       handleDeselectAll: handleDeselectAll,
       handleSelectAll: handleSelectAll,
       handleDragStart: handleDragStart,

package/lib/index.js

@@ -16,19 +16,23 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default":
  * A grid-based image picker component with sortable and selectable images.
  *
  * @param {Object} props - The props for GridImagePicker.
- * @param {string[]} props.listOfSrc - Array of image URLs to display in the grid.
+ * @param {Array<{src: string, editedSrc?: string}>} props.listOfImages - Array of image objects to display in the grid.
+ *        An image is considered editable/edited when it has an `editedSrc`; that enables the Original/Editada switch.
  * @param {number} [props.maxSelectablePreferenceByUser=10] - Maximum number of images that can be selected by the user.
  *        Default is 10. This value is a preference; if there are fewer images available than this number, it will adjust accordingly.
  * @param {number} [props.maxSizeInMB=8] - Maximum size in megabytes for each image. Default is 8 MB. Images exceeding this limit will be marked as an error.
  * @param {number} [props.minAspectRatio] - Minimum aspect ratio allowed for the images. Images that don't meet this ratio will be marked as an error.
  * @param {number} [props.maxAspectRatio] - Maximum aspect ratio allowed for the images. Images that exceed this ratio will be marked as an error.
  * @param {Function} [props.onChange] - Optional callback function invoked whenever the internal state of images changes.
- *        Called with the updated list of items as `(items) => onChange(items)`.
+ *        Called with the updated list of items as `(items) => onChange(items)`. Each item exposes `isEditedActive`
+ *        (whether the edited version is currently being shown); combine it with `editedSrc` to know which version is in use.
+ * @param {Function} [props.onSwitchChange] - Optional callback invoked when the Original/Editada switch changes, both on user
+ *        toggle and on the automatic flip after an image is (re)edited. Called with `(item, isEditedActive)`.
  * @param {Function} [props.sizeFetcher] - Optional fetch function to get the size of the images. Default: (src) => fetch(src)
  * @param {Object} props.texts - Nested texts
  */
 var GridImagePicker = exports.GridImagePicker = function GridImagePicker(_ref) {
-  var listOfSrc = _ref.listOfSrc,
+  var listOfImages = _ref.listOfImages,
     _ref$maxSelectablePre = _ref.maxSelectablePreferenceByUser,
     maxSelectablePreferenceByUser = _ref$maxSelectablePre === void 0 ? 10 : _ref$maxSelectablePre,
     _ref$maxSizeInMB = _ref.maxSizeInMB,
@@ -38,15 +42,17 @@ var GridImagePicker = exports.GridImagePicker = function GridImagePicker(_ref) {
     onChange = _ref.onChange,
     _ref$onEdit = _ref.onEdit,
     onEdit = _ref$onEdit === void 0 ? null : _ref$onEdit,
+    onSwitchChange = _ref.onSwitchChange,
     texts = _ref.texts,
     sizeFetcher = _ref.sizeFetcher;
   var _useGridImagePicker = (0, _useGridImagePicker2["default"])({
-      listOfSrc: listOfSrc,
+      listOfImages: listOfImages,
       maxSelectablePreferenceByUser: maxSelectablePreferenceByUser,
       maxSizeInMB: maxSizeInMB,
       minAspectRatio: minAspectRatio,
       maxAspectRatio: maxAspectRatio,
-      onChange: onChange
+      onChange: onChange,
+      onSwitchChange: onSwitchChange
     }),
     attributes = _useGridImagePicker.attributes,
     methods = _useGridImagePicker.methods;
@@ -55,6 +61,7 @@ var GridImagePicker = exports.GridImagePicker = function GridImagePicker(_ref) {
     status = attributes.status;
   var handleClickItem = methods.handleClickItem,
     handleUpdateItem = methods.handleUpdateItem,
+    handleSwitchChange = methods.handleSwitchChange,
     handleDeselectAll = methods.handleDeselectAll,
     handleSelectAll = methods.handleSelectAll,
     handleDragStart = methods.handleDragStart,
@@ -98,6 +105,7 @@ var GridImagePicker = exports.GridImagePicker = function GridImagePicker(_ref) {
       config: config,
       handleClick: handleClickItem,
       onEdit: onEdit,
+      onSwitchChange: handleSwitchChange,
       handleUpdateItem: handleUpdateItem,
       texts: texts,
       sizeFetcher: sizeFetcher

package/lib/utils/manageListOfItems.js

@@ -17,11 +17,14 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var getItemsInitialState = exports.getItemsInitialState = function getItemsInitialState(listOfSrc) {
-  var initializedItem = listOfSrc.map(function (src, index) {
+var getItemsInitialState = exports.getItemsInitialState = function getItemsInitialState(listOfImages) {
+  var initializedItem = listOfImages.map(function (image, index) {
     return {
       id: index + 1,
-      src: src,
+      src: image.src,
+      editedSrc: image.editedSrc,
+      // Whether the edited version is shown; only meaningful when there's an `editedSrc`.
+      isEditedActive: Boolean(image.editedSrc),
       checked: false,
       position: 0,
       height: 0,
@@ -180,10 +183,10 @@ var getDeselectAllItems = exports.getDeselectAllItems = function getDeselectAllI
 var getItemChanged = exports.getItemChanged = function getItemChanged(originalList, newList) {
   var length = Math.min(originalList.length, newList.length);
   for (var i = 0; i < length; i++) {
-    if (originalList[i] !== newList[i]) {
+    if (originalList[i].src !== newList[i].src) {
       return {
-        oldUrl: originalList[i],
-        newUrl: newList[i]
+        oldUrl: originalList[i].src,
+        newUrl: newList[i].src
       };
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintoandar-tokko/gridimagepicker",
-  "version": "1.0.19",
+  "version": "1.0.25",
   "main": "lib/index.js",
   "module": "src/index.js",
   "files": [
@@ -23,5 +23,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "749cd5d95523c9a7821ef878e20425832bb03842"
+  "gitHead": "ff1bd5286d3900060f981d2f8d81f1c074b4f22d"
 }

package/styles/ImageItemSwitch.css

@@ -0,0 +1,44 @@
+.imageItemSwitch {
+  align-items: center;
+  background-color: #EAF3F6;
+  border-radius: 100px;
+  bottom: 8px;
+  box-shadow: 0 1px 6px rgba(29, 35, 39, 0.20);
+  display: none;
+  grid-template-columns: repeat(2, 1fr);
+  left: 50%;
+  max-width: min(110px, 96%);
+  padding: 2px;
+  pointer-events: auto;
+  position: absolute;
+  transform: translateX(-50%);
+  width: 100%;
+  z-index: 2;
+}
+
+.imageItemSwitch[data-visible="true"] {
+  display: grid;
+}
+
+.imageItemSwitch[data-visible="true"][data-cover="true"] {
+  bottom: 28px;
+}
+
+.imageItemSwitchOption {
+  border-radius: 100px;
+  color: #1B90D2;
+  cursor: pointer;
+  font-family: "Nunito Sans", sans-serif;
+  font-size: 11px;
+  font-weight: 600;
+  line-height: 1;
+  padding: 2px 6px;
+  pointer-events: auto;
+  transition: background-color 100ms linear, color 100ms linear;
+  white-space: nowrap;
+}
+
+.imageItemSwitchOption[data-active="true"] {
+  background-color: #1B90D2;
+  color: #F2F8FA;
+}