Merge branch 'develop' into 'fb-root-42'

bmartel · bmartel · commit 7d7611067393 · 2025-07-02T14:19:07.000Z
Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/16027689333
diff --git a/web/libs/core/src/lib/utils/feature-flags/ff.ts b/web/libs/core/src/lib/utils/feature-flags/ff.ts
@@ -1,5 +1,3 @@
-import { FF_BITMASK, FF_SAMPLE_DATASETS } from "./flags";
-
 const FEATURE_FLAGS = window.APP_SETTINGS?.feature_flags || {};
 
 // TODO: remove the override + if statement once LSE and LSO start building
@@ -11,8 +9,6 @@ const FLAGS_OVERRIDE: Record<string, boolean> = {
   //
   // Add your flags overrides as following:
   // [FF_FLAG_NAME]: boolean
-  [FF_SAMPLE_DATASETS]: true,
-  [FF_BITMASK]: true,
 };
 
 /**
diff --git a/web/libs/editor/src/components/Settings/Settings.jsx b/web/libs/editor/src/components/Settings/Settings.jsx
@@ -13,6 +13,7 @@ import * as TagSettings from "./TagSettings";
 import { IconClose } from "@humansignal/icons";
 import { Checkbox, Toggle } from "@humansignal/ui";
 import { FF_DEV_3873, isFF } from "../../utils/feature-flags";
+import { ff } from "@humansignal/core";
 
 const HotkeysDescription = () => {
   const columns = [
@@ -64,7 +65,10 @@ const HotkeysDescription = () => {
 
 const newUI = isFF(FF_DEV_3873) ? { newUI: true } : {};
 
-const editorSettingsKeys = Object.keys(EditorSettings);
+const editorSettingsKeys = Object.keys(EditorSettings).filter((key) => {
+  const flag = EditorSettings[key].flag;
+  return flag ? ff.isActive(flag) : true;
+});
 
 if (isFF(FF_DEV_3873)) {
   const enableTooltipsIndex = editorSettingsKeys.findIndex((key) => key === "enableTooltips");
diff --git a/web/libs/editor/src/core/settings/editorsettings.js b/web/libs/editor/src/core/settings/editorsettings.js
@@ -1,3 +1,5 @@
+import { FF_BITMASK } from "@humansignal/core/lib/utils/feature-flags";
+
 export default {
   enableHotkeys: {
     newUI: {
@@ -93,5 +95,6 @@ export default {
     description: "Enable inverted zoom direction",
     onChangeEvent: "toggleInvertedZoom",
     defaultValue: false,
+    flag: FF_BITMASK,
   },
 };
diff --git a/web/libs/editor/src/tags/object/Image/Image.js b/web/libs/editor/src/tags/object/Image/Image.js
@@ -33,6 +33,7 @@ import { ImageEntityMixin } from "./ImageEntityMixin";
 import { ImageSelection } from "./ImageSelection";
 import { RELATIVE_STAGE_HEIGHT, RELATIVE_STAGE_WIDTH, SNAP_TO_PIXEL_MODE } from "../../../components/ImageView/Image";
 import MultiItemObjectBase from "../MultiItemObjectBase";
+import { FF_BITMASK } from "@humansignal/core/lib/utils/feature-flags";
 
 const IMAGE_PRELOAD_COUNT = 3;
 const ZOOM_INTENSITY = 0.009;
@@ -966,8 +967,12 @@ const Model = types
       isEvent = false,
     ) {
       if (val) {
-        const zoomScale = isEvent
-          ? self.getInertialZoom(val)
+        const zoomScale = ff.isActive(FF_BITMASK)
+          ? isEvent
+            ? self.getInertialZoom(val)
+            : val > 0
+              ? self.currentZoom * self.zoomBy
+              : self.currentZoom / self.zoomBy
           : val > 0
             ? self.currentZoom * self.zoomBy
             : self.currentZoom / self.zoomBy;
