@solostylist/image-editor 1.0.22 → 1.0.23

package/lib/components/topbar/save-button.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"save-button.d.ts","sourceRoot":"","sources":["../../../src/components/topbar/save-button.tsx"],"names":[],"mappings":"AAiCA,QAAA,MAAM,UAAU,sDAsRf,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"save-button.d.ts","sourceRoot":"","sources":["../../../src/components/topbar/save-button.tsx"],"names":[],"mappings":"AAgCA,QAAA,MAAM,UAAU,sDAqRf,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/lib/components/topbar/save-button.js

@@ -14,9 +14,9 @@ import { SET_FEEDBACK, SET_SAVING } from "../../actions";
 import Slider from "../common/slider";
 import { Resize } from "../tools/resize";
 import { useStore, useTransformedImgData } from "../../hooks";
-import { CLOSING_REASONS, DEFAULT_SAVE_QUALITY, ELLIPSE_CROP, SUPPORTED_IMAGE_TYPES } from "../../utils/constants";
+import { CLOSING_REASONS, DEFAULT_SAVE_QUALITY, SUPPORTED_IMAGE_TYPES } from "../../utils/constants";
 import getDefaultSaveQuality from "../../utils/get-default-save-quality";
-import getFileFullName from "../../utils/get-file-full-name";
+import resolveImageFileInfo from "../../utils/resolve-image-file-info";
 import restrictNumber from "../../utils/restrict-number";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var isFieSaveMounted = true;
@@ -45,6 +45,7 @@ var SaveButton = function SaveButton() {
     defaultSavedImageType = _state$config.defaultSavedImageType,
     _state$config$default = _state$config.defaultSavedImageQuality,
     defaultSavedImageQuality = _state$config$default === void 0 ? DEFAULT_SAVE_QUALITY : _state$config$default,
+    savedImageNamePrefix = _state$config.savedImageNamePrefix,
     disableSaveIfNoChanges = _state$config.disableSaveIfNoChanges,
     removeSaveButton = _state$config.removeSaveButton;
   var dialog = useDialog();
@@ -142,7 +143,14 @@ var SaveButton = function SaveButton() {
     }));
   };
   var getFileNameAndExtension = function getFileNameAndExtension() {
-    return getFileFullName(defaultSavedImageName !== null && defaultSavedImageName !== void 0 ? defaultSavedImageName : originalImage === null || originalImage === void 0 ? void 0 : originalImage.title, forceToPngInEllipticalCrop && (crop === null || crop === void 0 ? void 0 : crop.ratio) === ELLIPSE_CROP ? 'png' : SUPPORTED_IMAGE_TYPES.includes(defaultSavedImageType === null || defaultSavedImageType === void 0 ? void 0 : defaultSavedImageType.toLowerCase()) && defaultSavedImageType || undefined);
+    return resolveImageFileInfo({
+      defaultSavedImageName: defaultSavedImageName,
+      originalImageTitle: originalImage === null || originalImage === void 0 ? void 0 : originalImage.title,
+      savedImageNamePrefix: savedImageNamePrefix,
+      forceToPngInEllipticalCrop: forceToPngInEllipticalCrop,
+      cropRatio: crop === null || crop === void 0 ? void 0 : crop.ratio,
+      defaultSavedImageType: defaultSavedImageType
+    });
   };
   var _useState3 = useState(originalImage),
     _useState4 = _slicedToArray(_useState3, 2),

package/lib/hooks/use-image-editor-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-image-editor-actions.d.ts","sourceRoot":"","sources":["../../src/hooks/use-image-editor-actions.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5C;AAED,QAAA,MAAM,qBAAqB;gCA6EA,OAAO,CAAC,aAAa,CAAC,GAAG,MAAM;;mCAfR,aAAa;CAiF9D,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"use-image-editor-actions.d.ts","sourceRoot":"","sources":["../../src/hooks/use-image-editor-actions.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5C;AAED,QAAA,MAAM,qBAAqB;gCAwDA,OAAO,CAAC,aAAa,CAAC,GAAG,MAAM;;mCAfR,aAAa;CAiF9D,CAAC;AAEF,eAAe,qBAAqB,CAAC"}

package/lib/hooks/use-image-editor-actions.js

@@ -6,10 +6,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { useCallback } from 'react';
 import { RESET, SET_SAVING } from "../actions";
 import { useFeedbackHandler, useStore, useTransformedImgData } from "./index";
-import { DEFAULT_SAVE_QUALITY, ELLIPSE_CROP, SUPPORTED_IMAGE_TYPES } from "../utils/constants";
+import { DEFAULT_SAVE_QUALITY } from "../utils/constants";
 import getDefaultSaveQuality from "../utils/get-default-save-quality";
-import getFileFullName from "../utils/get-file-full-name";
-import randomId from "../utils/random-id";
+import resolveImageFileInfo from "../utils/resolve-image-file-info";
 var useImageEditorActions = function useImageEditorActions() {
   var _useStore = useStore(),
     dispatch = _useStore.dispatch,
@@ -34,17 +33,14 @@ var useImageEditorActions = function useImageEditorActions() {
     handleError = _useFeedbackHandler.handleError;
   var transformImgFn = useTransformedImgData();
   var getFileNameAndExtension = useCallback(function () {
-    var nameFromSource = defaultSavedImageName !== null && defaultSavedImageName !== void 0 ? defaultSavedImageName : originalImage === null || originalImage === void 0 ? void 0 : originalImage.title;
-    var resolvedName = nameFromSource && nameFromSource.length > 0 ? nameFromSource : savedImageNamePrefix ? function () {
-      var now = new Date();
-      var day = String(now.getDate()).padStart(2, '0');
-      var month = String(now.getMonth() + 1).padStart(2, '0');
-      var year = String(now.getFullYear());
-      var dateStamp = "".concat(day, "-").concat(month, "-").concat(year);
-      var uuid = typeof crypto !== 'undefined' && crypto.randomUUID ? crypto.randomUUID() : randomId();
-      return "".concat(savedImageNamePrefix, "_").concat(dateStamp, "-").concat(uuid);
-    }() : undefined;
-    return getFileFullName(resolvedName, forceToPngInEllipticalCrop && (crop === null || crop === void 0 ? void 0 : crop.ratio) === ELLIPSE_CROP ? 'png' : SUPPORTED_IMAGE_TYPES.includes(defaultSavedImageType === null || defaultSavedImageType === void 0 ? void 0 : defaultSavedImageType.toLowerCase()) && defaultSavedImageType || undefined);
+    return resolveImageFileInfo({
+      defaultSavedImageName: defaultSavedImageName,
+      originalImageTitle: originalImage === null || originalImage === void 0 ? void 0 : originalImage.title,
+      savedImageNamePrefix: savedImageNamePrefix,
+      forceToPngInEllipticalCrop: forceToPngInEllipticalCrop,
+      cropRatio: crop === null || crop === void 0 ? void 0 : crop.ratio,
+      defaultSavedImageType: defaultSavedImageType
+    });
   }, [defaultSavedImageName, originalImage, savedImageNamePrefix, forceToPngInEllipticalCrop, crop === null || crop === void 0 ? void 0 : crop.ratio, defaultSavedImageType]);
   var getDefaultImageFileInfo = useCallback(function () {
     var _getFileNameAndExtens = getFileNameAndExtension(),

package/lib/hooks/use-transformed-img-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-transformed-img-data.d.ts","sourceRoot":"","sources":["../../src/hooks/use-transformed-img-data.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAY/C,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5C;AAED,UAAU,oBAAoB;IAC5B,SAAS,EAAE,cAAc,CAAC;IAC1B,WAAW,EAAE,gBAAgB,CAAC;IAC9B,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;CACjC;AAED,KAAK,oBAAoB,GAAG,CAC1B,aAAa,CAAC,EAAE,aAAa,EAC7B,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,EAC7B,uBAAuB,CAAC,EAAE,OAAO,EACjC,WAAW,CAAC,EAAE,OAAO,KAClB,oBAAoB,CAAC;AAE1B,QAAA,MAAM,qBAAqB,QAAO,oBAyLjC,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"use-transformed-img-data.d.ts","sourceRoot":"","sources":["../../src/hooks/use-transformed-img-data.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAU/C,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5C;AAED,UAAU,oBAAoB;IAC5B,SAAS,EAAE,cAAc,CAAC;IAC1B,WAAW,EAAE,gBAAgB,CAAC;IAC9B,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;CACjC;AAED,KAAK,oBAAoB,GAAG,CAC1B,aAAa,CAAC,EAAE,aAAa,EAC7B,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,EAC7B,uBAAuB,CAAC,EAAE,OAAO,EACjC,WAAW,CAAC,EAAE,OAAO,KAClB,oBAAoB,CAAC;AAE1B,QAAA,MAAM,qBAAqB,QAAO,oBAyLjC,CAAC;AAEF,eAAe,qBAAqB,CAAC"}

package/lib/hooks/use-transformed-img-data.js

@@ -4,10 +4,10 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 import Konva from 'konva';
 import { HIDE_LOADER, SET_SAVED } from "../actions";
-import { ELLIPSE_CROP, IMAGE_NODE_ID, SUPPORTED_IMAGE_TYPES } from "../utils/constants";
-import getFileFullName from "../utils/get-file-full-name";
+import { IMAGE_NODE_ID } from "../utils/constants";
 import getSizeAfterRotation from "../utils/get-size-after-rotation";
 import mapCropBox from "../utils/map-crop-box";
+import resolveImageFileInfo from "../utils/resolve-image-file-info";
 import { serializeDesignState } from "../utils/serialize-design-state";
 import useStore from "./use-store";
 var useTransformedImgData = function useTransformedImgData() {
@@ -28,7 +28,9 @@ var useTransformedImgData = function useTransformedImgData() {
     savingPixelRatio = _state$config.savingPixelRatio,
     previewPixelRatio = _state$config.previewPixelRatio,
     forceToPngInEllipticalCrop = _state$config.forceToPngInEllipticalCrop,
-    defaultSavedImageType = _state$config.defaultSavedImageType;
+    defaultSavedImageType = _state$config.defaultSavedImageType,
+    defaultSavedImageName = _state$config.defaultSavedImageName,
+    savedImageNamePrefix = _state$config.savedImageNamePrefix;
   var getTransformedImgData = function getTransformedImgData() {
     var _x, _y, _width, _height, _mappedCropBox$x, _mappedCropBox$y, _size$width, _size$height;
     var imageFileInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -72,7 +74,14 @@ var useTransformedImgData = function useTransformedImgData() {
       scaleX: preparedDesignLayerScale.x,
       scaleY: preparedDesignLayerScale.y
     });
-    var _ref = _objectSpread(_objectSpread({}, (!currentImgFileInfo.name || !currentImgFileInfo.extension) && getFileFullName(originalImage.title, forceToPngInEllipticalCrop && crop.ratio === ELLIPSE_CROP ? 'png' : SUPPORTED_IMAGE_TYPES.includes(defaultSavedImageType === null || defaultSavedImageType === void 0 ? void 0 : defaultSavedImageType.toLowerCase()) && defaultSavedImageType || undefined)), currentImgFileInfo),
+    var _ref = _objectSpread(_objectSpread({}, (!currentImgFileInfo.name || !currentImgFileInfo.extension) && resolveImageFileInfo({
+        defaultSavedImageName: defaultSavedImageName,
+        originalImageTitle: originalImage.title,
+        savedImageNamePrefix: savedImageNamePrefix,
+        forceToPngInEllipticalCrop: forceToPngInEllipticalCrop,
+        cropRatio: crop.ratio,
+        defaultSavedImageType: defaultSavedImageType
+      })), currentImgFileInfo),
       name = _ref.name,
       extension = _ref.extension,
       _ref$quality = _ref.quality,

package/lib/utils/resolve-image-file-info.d.ts

@@ -0,0 +1,16 @@
+interface ResolveImageFileInfoParams {
+    defaultSavedImageName?: string;
+    originalImageTitle?: string;
+    savedImageNamePrefix?: string;
+    forceToPngInEllipticalCrop?: boolean;
+    cropRatio?: string | number;
+    defaultSavedImageType?: string | null;
+}
+interface ResolvedImageFileInfo {
+    fullName: string;
+    name: string;
+    extension: string;
+}
+declare const resolveImageFileInfo: ({ defaultSavedImageName, originalImageTitle, savedImageNamePrefix, forceToPngInEllipticalCrop, cropRatio, defaultSavedImageType, }: ResolveImageFileInfoParams) => ResolvedImageFileInfo;
+export default resolveImageFileInfo;
+//# sourceMappingURL=resolve-image-file-info.d.ts.map

package/lib/utils/resolve-image-file-info.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-image-file-info.d.ts","sourceRoot":"","sources":["../../src/utils/resolve-image-file-info.ts"],"names":[],"mappings":"AAOA,UAAU,0BAA0B;IAClC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC;AAED,UAAU,qBAAqB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAuCD,QAAA,MAAM,oBAAoB,GAAI,oIAO3B,0BAA0B,KAAG,qBAgB/B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/lib/utils/resolve-image-file-info.js

@@ -0,0 +1,40 @@
+import { ELLIPSE_CROP, SUPPORTED_IMAGE_TYPES } from "./constants";
+import getFileFullName from "./get-file-full-name";
+import randomId from "./random-id";
+var buildDefaultNameFromPrefix = function buildDefaultNameFromPrefix(savedImageNamePrefix) {
+  if (!savedImageNamePrefix) {
+    return undefined;
+  }
+  var now = new Date();
+  var day = String(now.getDate()).padStart(2, '0');
+  var month = String(now.getMonth() + 1).padStart(2, '0');
+  var year = String(now.getFullYear());
+  var dateStamp = "".concat(day, "-").concat(month, "-").concat(year);
+  var uuid = typeof crypto !== 'undefined' && crypto.randomUUID ? crypto.randomUUID() : randomId();
+  return "".concat(savedImageNamePrefix, "_").concat(dateStamp, "-").concat(uuid);
+};
+var resolveAppendedExtension = function resolveAppendedExtension(_ref) {
+  var forceToPngInEllipticalCrop = _ref.forceToPngInEllipticalCrop,
+    cropRatio = _ref.cropRatio,
+    defaultSavedImageType = _ref.defaultSavedImageType;
+  if (forceToPngInEllipticalCrop && cropRatio === ELLIPSE_CROP) {
+    return 'png';
+  }
+  var normalizedImageType = defaultSavedImageType === null || defaultSavedImageType === void 0 ? void 0 : defaultSavedImageType.toLowerCase();
+  return normalizedImageType && SUPPORTED_IMAGE_TYPES.includes(normalizedImageType) ? normalizedImageType : undefined;
+};
+var resolveImageFileInfo = function resolveImageFileInfo(_ref2) {
+  var defaultSavedImageName = _ref2.defaultSavedImageName,
+    originalImageTitle = _ref2.originalImageTitle,
+    savedImageNamePrefix = _ref2.savedImageNamePrefix,
+    forceToPngInEllipticalCrop = _ref2.forceToPngInEllipticalCrop,
+    cropRatio = _ref2.cropRatio,
+    defaultSavedImageType = _ref2.defaultSavedImageType;
+  var explicitName = defaultSavedImageName && defaultSavedImageName.length > 0 ? defaultSavedImageName : originalImageTitle && originalImageTitle.length > 0 ? originalImageTitle : buildDefaultNameFromPrefix(savedImageNamePrefix);
+  return getFileFullName(explicitName, resolveAppendedExtension({
+    forceToPngInEllipticalCrop: forceToPngInEllipticalCrop,
+    cropRatio: cropRatio,
+    defaultSavedImageType: defaultSavedImageType
+  }));
+};
+export default resolveImageFileInfo;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.0.22",
+  "version": "1.0.23",
   "license": "MIT",
   "author": "Lê Đặng Trường Đạt",
   "main": "./lib/index.js",