scandit-datacapture-frameworks-core 8.3.1 → 8.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scandit-datacapture-frameworks-core",
-  "version": "8.3.1",
+  "version": "8.4.0",
   "description": "Core common package",
   "author": {
     "name": "Scandit",

package/test/CameraSettings.test.ts

@@ -306,6 +306,50 @@ describe('CameraSettings', () => {
         });
     });
 
+    describe('zoomLevels', () => {
+        it('initializes with default zoomLevels from defaults', () => {
+            const settings = new CameraSettings();
+            expect(settings.zoomLevels).toEqual([1, 2]);
+        });
+
+        it('can be set to custom zoom levels', () => {
+            const settings = new CameraSettings();
+            settings.zoomLevels = [0.5, 1, 2, 3];
+            expect(settings.zoomLevels).toEqual([0.5, 1, 2, 3]);
+        });
+
+        it('is deserialized from JSON', () => {
+            const json = {
+                preferredResolution: 'auto',
+                zoomFactor: 1,
+                zoomGestureZoomFactor: 2,
+                zoomLevels: [1, 2, 5],
+            };
+
+            const settings = (CameraSettings as any).fromJSON(json);
+            expect(settings.zoomLevels).toEqual([1, 2, 5]);
+        });
+
+        it('defaults to [1, 2] when absent from JSON', () => {
+            const json = {
+                preferredResolution: 'auto',
+                zoomFactor: 1,
+                zoomGestureZoomFactor: 2,
+            };
+
+            const settings = (CameraSettings as any).fromJSON(json);
+            expect(settings.zoomLevels).toEqual([1, 2]);
+        });
+
+        it('is serialized to JSON', () => {
+            const settings = new CameraSettings();
+            settings.zoomLevels = [0.5, 1, 3];
+
+            const json = JSON.parse(JSON.stringify(settings));
+            expect(json.zoomLevels).toEqual([0.5, 1, 3]);
+        });
+    });
+
     describe('copy constructor', () => {
         it('copies all settings including focus sub-fields', () => {
             const original = new CameraSettings();

package/test/CoreDefaults.test.ts

@@ -0,0 +1,62 @@
+import { describe, it, expect } from '@jest/globals';
+import { parseDefaults } from '../src/defaults/CoreDefaults';
+import { mockCoreDefaultsData } from '../__mocks__/Defaults';
+import { SwipeToZoom } from '../src/camera/SwipeToZoom';
+import { PinchToZoom } from '../src/camera/PinchToZoom';
+
+describe('parseDefaults — DataCaptureView.zoomGestures', () => {
+  // Cordova / React Native bridge shape: the whole field arrives as a
+  // single JSON-encoded string and is parsed once at the top level.
+  it('parses zoomGestures when sent as a stringified array', () => {
+    const json = {
+      ...mockCoreDefaultsData,
+      DataCaptureView: {
+        ...mockCoreDefaultsData.DataCaptureView,
+        zoomGestures: '[{"type":"swipeToZoom"},{"type":"pinchToZoom"}]',
+      },
+    };
+
+    const defaults = parseDefaults(json);
+
+    expect(defaults.DataCaptureView.zoomGestures).toHaveLength(2);
+    expect(defaults.DataCaptureView.zoomGestures[0]).toBeInstanceOf(SwipeToZoom);
+    expect(defaults.DataCaptureView.zoomGestures[1]).toBeInstanceOf(PinchToZoom);
+  });
+
+  // Capacitor bridge shape: arrays come through as arrays whose elements
+  // are still JSON-encoded strings. The previous implementation cast the
+  // array directly and lost every element.
+  it('parses zoomGestures when sent as an array of JSON strings (Capacitor)', () => {
+    const json = {
+      ...mockCoreDefaultsData,
+      DataCaptureView: {
+        ...mockCoreDefaultsData.DataCaptureView,
+        zoomGestures: ['{"type":"swipeToZoom"}', '{"type":"pinchToZoom"}'],
+      },
+    };
+
+    const defaults = parseDefaults(json);
+
+    expect(defaults.DataCaptureView.zoomGestures).toHaveLength(2);
+    expect(defaults.DataCaptureView.zoomGestures[0]).toBeInstanceOf(SwipeToZoom);
+    expect(defaults.DataCaptureView.zoomGestures[1]).toBeInstanceOf(PinchToZoom);
+  });
+
+  // Older native that doesn't send zoomGestures at all — fall back to the
+  // legacy singular zoomGesture and wrap it.
+  it('falls back to singular zoomGesture when zoomGestures is missing', () => {
+    const { zoomGestures, ...rest } = mockCoreDefaultsData.DataCaptureView;
+    const json = {
+      ...mockCoreDefaultsData,
+      DataCaptureView: {
+        ...rest,
+        zoomGesture: '{"type":"swipeToZoom"}',
+      },
+    };
+
+    const defaults = parseDefaults(json);
+
+    expect(defaults.DataCaptureView.zoomGestures).toHaveLength(1);
+    expect(defaults.DataCaptureView.zoomGestures[0]).toBeInstanceOf(SwipeToZoom);
+  });
+});

package/test/ZoomSwitchControl.test.ts

@@ -0,0 +1,130 @@
+import { describe, it, expect, beforeEach } from '@jest/globals';
+import { ZoomSwitchControl, ZoomSwitchOrientation } from '../src';
+import { loadMockDefaults } from '../__mocks__/Defaults';
+
+beforeEach(() => {
+    loadMockDefaults();
+});
+
+describe('ZoomSwitchControl', () => {
+    describe('default constructor', () => {
+        it('initializes with default v2 properties', () => {
+            const control = new ZoomSwitchControl();
+
+            expect(control.orientation).toBe(ZoomSwitchOrientation.Horizontal);
+            expect(control.isAlwaysExpanded).toBe(false);
+            expect(control.isExpanded).toBe(false);
+            expect(control.accessibilityLabel).toBe('Zoom <level>');
+            expect(control.accessibilityHint).toBe('Adjusts the camera zoom level');
+            expect(control.selectedZoomLevel).toBe(1);
+        });
+
+        it('initializes with null legacy accessibility properties', () => {
+            const control = new ZoomSwitchControl();
+
+            expect(control.contentDescriptionWhenZoomedOut).toBeNull();
+            expect(control.contentDescriptionWhenZoomedIn).toBeNull();
+            expect(control.accessibilityLabelWhenZoomedOut).toBeNull();
+            expect(control.accessibilityLabelWhenZoomedIn).toBeNull();
+            expect(control.accessibilityHintWhenZoomedOut).toBeNull();
+            expect(control.accessibilityHintWhenZoomedIn).toBeNull();
+        });
+    });
+
+    describe('v2 property setters', () => {
+        it('allows setting orientation to Vertical', () => {
+            const control = new ZoomSwitchControl();
+            control.orientation = ZoomSwitchOrientation.Vertical;
+            expect(control.orientation).toBe(ZoomSwitchOrientation.Vertical);
+        });
+
+        it('allows setting isAlwaysExpanded', () => {
+            const control = new ZoomSwitchControl();
+            control.isAlwaysExpanded = true;
+            expect(control.isAlwaysExpanded).toBe(true);
+        });
+
+        it('allows setting isExpanded', () => {
+            const control = new ZoomSwitchControl();
+            control.isExpanded = true;
+            expect(control.isExpanded).toBe(true);
+        });
+
+        it('allows setting accessibilityLabel', () => {
+            const control = new ZoomSwitchControl();
+            control.accessibilityLabel = 'Camera zoom';
+            expect(control.accessibilityLabel).toBe('Camera zoom');
+        });
+
+        it('allows setting accessibilityHint', () => {
+            const control = new ZoomSwitchControl();
+            control.accessibilityHint = 'Double tap to zoom';
+            expect(control.accessibilityHint).toBe('Double tap to zoom');
+        });
+    });
+
+    describe('selectedZoomLevel', () => {
+        it('is read-only (no public setter)', () => {
+            const control = new ZoomSwitchControl();
+            expect(control.selectedZoomLevel).toBe(1);
+        });
+    });
+
+    describe('JSON serialization', () => {
+        it('serializes v2 properties with correct JSON keys', () => {
+            const control = new ZoomSwitchControl();
+            control.orientation = ZoomSwitchOrientation.Vertical;
+            control.isAlwaysExpanded = true;
+            control.isExpanded = true;
+            control.accessibilityLabel = 'Camera zoom';
+            control.accessibilityHint = 'Double tap';
+
+            const json = JSON.parse(JSON.stringify(control));
+
+            expect(json.type).toBe('zoom');
+            expect(json.orientation).toBe('vertical');
+            expect(json.isAlwaysExpanded).toBe(true);
+            expect(json.isExpanded).toBe(true);
+            expect(json.accessibilityLabel).toBe('Camera zoom');
+            expect(json.accessibilityHint).toBe('Double tap');
+        });
+
+        it('does not serialize selectedZoomLevel', () => {
+            const control = new ZoomSwitchControl();
+
+            const json = JSON.parse(JSON.stringify(control));
+
+            expect(json.selectedZoomLevel).toBeUndefined();
+            expect(json._selectedZoomLevel).toBeUndefined();
+        });
+
+        it('serializes default values correctly', () => {
+            const control = new ZoomSwitchControl();
+
+            const json = JSON.parse(JSON.stringify(control));
+
+            expect(json.orientation).toBe('horizontal');
+            expect(json.isAlwaysExpanded).toBe(false);
+            expect(json.isExpanded).toBe(false);
+            expect(json.accessibilityLabel).toBe('Zoom <level>');
+            expect(json.accessibilityHint).toBe('Adjusts the camera zoom level');
+        });
+
+        it('still serializes legacy icon properties', () => {
+            const control = new ZoomSwitchControl();
+
+            const json = JSON.parse(JSON.stringify(control));
+
+            expect(json.icon).toBeDefined();
+            expect(json.icon.zoomedOut).toBeDefined();
+            expect(json.icon.zoomedIn).toBeDefined();
+        });
+    });
+});
+
+describe('ZoomSwitchOrientation', () => {
+    it('has correct string values for JSON serialization', () => {
+        expect(ZoomSwitchOrientation.Horizontal).toBe('horizontal');
+        expect(ZoomSwitchOrientation.Vertical).toBe('vertical');
+    });
+});