@searpent/react-image-annotate 2.0.71 → 2.0.73

package/Annotator/reducers/general-reducer.js

@@ -1181,8 +1181,8 @@ export default (function (state, action) {
         var name = action.name,
             value = action.value,
             _imageIndex = action.imageIndex,
-            _groupId2 = action.groupId;
-        console.log(action);
+            _groupId2 = action.groupId,
+            metadataId = action.metadataId;
 
         if (isNaN(_imageIndex)) {
           var _state$albumMetadata;
@@ -1221,7 +1221,7 @@ export default (function (state, action) {
             var articleRegionToUpdate = (_state$images$_imageI2 = state.images[_imageIndex]) === null || _state$images$_imageI2 === void 0 ? void 0 : _state$images$_imageI2.regions[articleMetadataRegionIdx];
             var articleMetadata = JSON.parse(articleRegionToUpdate.text);
             var toBeUpdatedMetadataIdx = articleMetadata.findIndex(function (i) {
-              return i.key === name;
+              return i.metadataId === metadataId;
             });
 
             if (toBeUpdatedMetadataIdx < 0) {
@@ -1405,6 +1405,22 @@ export default (function (state, action) {
         }));
       }
 
+    case "ZOOM_RESET":
+      {
+        if (state.selectedImage === undefined || state.selectedImage === null) {
+          return state;
+        }
+
+        var deselectedRegions = state.images[state.selectedImage].regions.map(function (i) {
+          return _objectSpread({}, i, {
+            highlighted: false,
+            groupHighlighted: false
+          });
+        });
+        state = setIn(state, ["selectedGroupId"], null);
+        return setIn(state, ["images", state.selectedImage, "regions"], deselectedRegions);
+      }
+
     default:
       break;
   }

package/HighlightBox/index.js

@@ -27,11 +27,12 @@ var useStyles = makeStyles(function (theme) {
         opacity: 0.6
       },
       "& path": {
-        vectorEffect: "non-scaling-stroke",
-        strokeWidth: 2,
-        stroke: "#FFF",
+        // NOTE: attributes below commnted because resetting screen caused old frame to highlight
+        // vectorEffect: "non-scaling-stroke",
+        // strokeWidth: 2,
+        // stroke: "#FFF",
+        // strokeDasharray: 5,
         fill: "none",
-        strokeDasharray: 5,
         animationName: "$borderDance",
         animationDuration: "4s",
         animationTimingFunction: "linear",

package/ImageCanvas/index.js

@@ -100,6 +100,7 @@ export var ImageCanvas = function ImageCanvas(_ref2) {
       onDeleteGroup = _ref2.onDeleteGroup,
       onChangeVideoTime = _ref2.onChangeVideoTime,
       onChangeVideoPlaying = _ref2.onChangeVideoPlaying,
+      onResetZoom = _ref2.onResetZoom,
       onRegionClassAdded = _ref2.onRegionClassAdded,
       _ref2$zoomOnAllowedAr = _ref2.zoomOnAllowedArea,
       zoomOnAllowedArea = _ref2$zoomOnAllowedAr === void 0 ? true : _ref2$zoomOnAllowedAr,
@@ -221,6 +222,7 @@ export var ImageCanvas = function ImageCanvas(_ref2) {
   }
 
   var resetZoom = function resetZoom() {
+    onResetZoom();
     changeMat(getDefaultMat(zoomOnAllowedArea ? allowedArea : null, layoutParams.current));
   };
 

package/MainLayout/index.js

@@ -233,6 +233,11 @@ export var MainLayout = function MainLayout(_ref5) {
     onDeleteRegion: action("DELETE_REGION", "region"),
     onDeleteGroup: action("DELETE_GROUP", "groupId"),
     onBeginBoxTransform: action("BEGIN_BOX_TRANSFORM", "box", "directions"),
+    onResetZoom: function onResetZoom() {
+      return dispatch({
+        type: "ZOOM_RESET"
+      });
+    },
     onBeginMovePolygonPoint: action("BEGIN_MOVE_POLYGON_POINT", "polygon", "pointIndex"),
     onBeginMoveKeypoint: action("BEGIN_MOVE_KEYPOINT", "region", "keypointId"),
     onAddPolygonPoint: action("ADD_POLYGON_POINT", "polygon", "point", "pointIndex"),

package/MetadataEditorSidebarBox/index.js

@@ -30,6 +30,7 @@ var MetadataItem = function MetadataItem(_ref2) {
 
   var name = _ref2.name,
       value = _ref2.value,
+      metadataId = _ref2.metadataId,
       imageIndex = _ref2.imageIndex,
       groupId = _ref2.groupId,
       onChange = _ref2.onChange,
@@ -45,7 +46,8 @@ var MetadataItem = function MetadataItem(_ref2) {
       name: name,
       value: value,
       imageIndex: imageIndex,
-      groupId: groupId
+      groupId: groupId,
+      metadataId: metadataId
     });
   };
 
@@ -112,11 +114,13 @@ var MetadataList = function MetadataList(_ref3) {
       groupId = _ref3.groupId;
   return React.createElement("div", null, React.createElement("h2", null, title), metadata && metadata.map(function (_ref4) {
     var key = _ref4.key,
-        value = _ref4.value;
+        value = _ref4.value,
+        metadataId = _ref4.metadataId;
     return React.createElement(MetadataItem, {
       name: key,
       value: value,
       imageIndex: imageIndex,
+      metadataId: metadataId,
       groupId: groupId,
       onChange: onMetadataChange,
       metadataConfig: metadataConfigs.find(function (i) {
@@ -170,7 +174,7 @@ export var MetadataEditorSidebarBox = function MetadataEditorSidebarBox(_ref6) {
   var selectedGroupId = state === null || state === void 0 ? void 0 : (_state$images$state$s2 = state.images[state.selectedImage]) === null || _state$images$state$s2 === void 0 ? void 0 : (_state$images$state$s3 = _state$images$state$s2.regions) === null || _state$images$state$s3 === void 0 ? void 0 : (_state$images$state$s4 = _state$images$state$s3.find(function (r) {
     return r.highlighted === true;
   })) === null || _state$images$state$s4 === void 0 ? void 0 : _state$images$state$s4.groupId;
-  var articleMetadata = [];
+  var articleMetadata = []; // example: [{key: "previousArticleId", value "123-123-123-123-123"}]
 
   if (selectedGroupId !== undefined) {
     var articleMetadataRegion = state === null || state === void 0 ? void 0 : state.images[state.selectedImage].regions.find(function (r) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@searpent/react-image-annotate",
-  "version": "2.0.71",
+  "version": "2.0.73",
   "dependencies": {
     "@editorjs/editorjs": "^2.25.0",
     "@editorjs/paragraph": "^2.8.0",