scandit-datacapture-frameworks-core 8.3.0-beta.1 → 8.3.1

package/__mocks__/Defaults.ts

@@ -1,6 +1,6 @@
 import { loadCoreDefaults } from '../src';
 
-const mockCoreDefaultsData = {
+export const mockCoreDefaultsData: any = {
   "Camera": {
     "defaultPosition": "worldFacing",
     "Settings": {
@@ -10,6 +10,11 @@ const mockCoreDefaultsData = {
       "focusRange": "near",
       "preferredResolution": "auto",
       "shouldPreferSmoothAutoFocus": false,
+      "torchLevel": 1,
+      "macroMode": "auto",
+      "adaptiveExposure": false,
+      "manualLensPosition": -1,
+      "focusStrategy": "auto",
       "properties": {}
     },
     "availablePositions": ["worldFacing", "userFacing"]

package/dist/dts/camera/CameraSettings.d.ts

@@ -6,11 +6,14 @@ import { MacroMode } from "./MacroMode";
 export interface CameraSettingsJSON {
     preferredResolution: string;
     zoomFactor: number;
-    focusRange: string;
     zoomGestureZoomFactor: number;
-    focusGestureStrategy: string;
+    macroMode?: string;
+    adaptiveExposure?: boolean;
+    torchLevel?: number;
+    focusRange?: string;
+    focusGestureStrategy?: string;
     shouldPreferSmoothAutoFocus: boolean;
-    properties: {
+    properties?: {
         [key: string]: any;
     };
 }

package/dist/dts/common/Color.d.ts

@@ -1,4 +1,4 @@
-import { StringSerializeable } from "../serializable";
+import { StringSerializeable } from '../serializable';
 export type ColorJSON = string;
 export interface PrivateColor {
     fromJSON(json: ColorJSON): Color;

package/dist/dts/defaults/CoreDefaults.d.ts

@@ -9,6 +9,8 @@ export interface CameraSettingsDefaults {
     zoomGestureZoomFactor: number;
     focusGestureStrategy: FocusGestureStrategy;
     shouldPreferSmoothAutoFocus: boolean;
+    manualLensPosition: number;
+    focusStrategy: string;
     torchLevel: number;
     macroMode: MacroMode;
     adaptiveExposure: boolean;

package/dist/index.js

@@ -1279,8 +1279,7 @@ class Color {
         return new Color(Color.normalizeHex(hex));
     }
     static fromRGBA(red, green, blue, alpha = 1) {
-        const hexString = [red, green, blue, this.normalizeAlpha(alpha)]
-            .reduce((hex, colorComponent) => hex + this.numberToHex(colorComponent), '');
+        const hexString = [red, green, blue, this.normalizeAlpha(alpha)].reduce((hex, colorComponent) => hex + this.numberToHex(colorComponent), '');
         return new Color(hexString);
     }
     static hexToNumber(hex) {
@@ -1304,13 +1303,16 @@ class Color {
         }
         // double digits if single digit
         if (hex.length < 6) {
-            hex = hex.split('').map(s => s + s).join('');
+            hex = hex
+                .split('')
+                .map(s => s + s)
+                .join('');
         }
         // add alpha if missing
         if (hex.length === 6) {
             hex = hex + 'FF';
         }
-        return '#' + hex.toUpperCase();
+        return hex.toUpperCase();
     }
     static normalizeAlpha(alpha) {
         if (alpha > 0 && alpha <= 1) {
@@ -1326,7 +1328,7 @@ class Color {
         return Color.fromHex(newHex);
     }
     toJSON() {
-        return this.hexadecimalString;
+        return '#' + this.hexadecimalString;
     }
 }
 
@@ -4358,13 +4360,19 @@ class CameraSettings extends DefaultSerializeable {
         this.focus.shouldPreferSmoothAutoFocus = newShouldPreferSmoothAutoFocus;
     }
     static fromJSON(json) {
+        var _a, _b, _c;
         const settings = new CameraSettings();
         settings.preferredResolution = json.preferredResolution;
         settings.zoomFactor = json.zoomFactor;
-        settings.focusRange = json.focusRange;
         settings.zoomGestureZoomFactor = json.zoomGestureZoomFactor;
+        settings.macroMode = ((_a = json.macroMode) !== null && _a !== void 0 ? _a : CameraSettings.coreDefaults.Camera.Settings.macroMode);
+        settings.adaptiveExposure = (_b = json.adaptiveExposure) !== null && _b !== void 0 ? _b : CameraSettings.coreDefaults.Camera.Settings.adaptiveExposure;
+        settings.torchLevel = (_c = json.torchLevel) !== null && _c !== void 0 ? _c : CameraSettings.coreDefaults.Camera.Settings.torchLevel;
+        settings.focusRange = json.focusRange;
         settings.focusGestureStrategy = json.focusGestureStrategy;
         settings.shouldPreferSmoothAutoFocus = json.shouldPreferSmoothAutoFocus;
+        // manualLensPosition, focusStrategy (and on iOS: range) arrive in the properties bag
+        // and are routed to the focus bag by setProperty via focusHiddenProperties
         if (json.properties !== undefined) {
             for (const key of Object.keys(json.properties)) {
                 settings.setProperty(key, json.properties[key]);
@@ -4373,7 +4381,7 @@ class CameraSettings extends DefaultSerializeable {
         return settings;
     }
     constructor(settings) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         super();
         this.preferredResolution = CameraSettings.coreDefaults.Camera.Settings.preferredResolution;
         this.zoomFactor = CameraSettings.coreDefaults.Camera.Settings.zoomFactor;
@@ -4391,7 +4399,9 @@ class CameraSettings extends DefaultSerializeable {
         this.focus = {
             range: CameraSettings.coreDefaults.Camera.Settings.focusRange,
             focusGestureStrategy: CameraSettings.coreDefaults.Camera.Settings.focusGestureStrategy,
-            shouldPreferSmoothAutoFocus: CameraSettings.coreDefaults.Camera.Settings.shouldPreferSmoothAutoFocus
+            shouldPreferSmoothAutoFocus: CameraSettings.coreDefaults.Camera.Settings.shouldPreferSmoothAutoFocus,
+            manualLensPosition: CameraSettings.coreDefaults.Camera.Settings.manualLensPosition,
+            focusStrategy: CameraSettings.coreDefaults.Camera.Settings.focusStrategy,
         };
         this.preferredResolution = (_a = settings === null || settings === void 0 ? void 0 : settings.preferredResolution) !== null && _a !== void 0 ? _a : CameraSettings.coreDefaults.Camera.Settings.preferredResolution;
         this.zoomFactor = (_b = settings === null || settings === void 0 ? void 0 : settings.zoomFactor) !== null && _b !== void 0 ? _b : CameraSettings.coreDefaults.Camera.Settings.zoomFactor;
@@ -4403,6 +4413,8 @@ class CameraSettings extends DefaultSerializeable {
             range: (_g = settings === null || settings === void 0 ? void 0 : settings.focusRange) !== null && _g !== void 0 ? _g : CameraSettings.coreDefaults.Camera.Settings.focusRange,
             focusGestureStrategy: (_h = settings === null || settings === void 0 ? void 0 : settings.focusGestureStrategy) !== null && _h !== void 0 ? _h : CameraSettings.coreDefaults.Camera.Settings.focusGestureStrategy,
             shouldPreferSmoothAutoFocus: (_j = settings === null || settings === void 0 ? void 0 : settings.shouldPreferSmoothAutoFocus) !== null && _j !== void 0 ? _j : CameraSettings.coreDefaults.Camera.Settings.shouldPreferSmoothAutoFocus,
+            manualLensPosition: (_k = settings === null || settings === void 0 ? void 0 : settings.focus) === null || _k === void 0 ? void 0 : _k.manualLensPosition,
+            focusStrategy: (_l = settings === null || settings === void 0 ? void 0 : settings.focus) === null || _l === void 0 ? void 0 : _l.focusStrategy,
         };
         if (settings !== undefined && settings !== null) {
             Object.getOwnPropertyNames(settings).forEach(propertyName => {
@@ -4608,7 +4620,7 @@ class LaserlineViewfinder extends DefaultSerializeable {
 }
 
 function parseDefaults(jsonDefaults) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const coreDefaults = {
         Camera: {
             Settings: {
@@ -4621,6 +4633,8 @@ function parseDefaults(jsonDefaults) {
                 torchLevel: (_a = jsonDefaults.Camera.Settings.torchLevel) !== null && _a !== void 0 ? _a : 1.0,
                 macroMode: ((_b = jsonDefaults.Camera.Settings.macroMode) !== null && _b !== void 0 ? _b : 'auto'),
                 adaptiveExposure: (_c = jsonDefaults.Camera.Settings.adaptiveExposure) !== null && _c !== void 0 ? _c : false,
+                manualLensPosition: (_d = jsonDefaults.Camera.Settings.manualLensPosition) !== null && _d !== void 0 ? _d : 0,
+                focusStrategy: (_e = jsonDefaults.Camera.Settings.focusStrategy) !== null && _e !== void 0 ? _e : 'auto',
                 properties: jsonDefaults.Camera.Settings.properties,
             },
             defaultPosition: (jsonDefaults.Camera.defaultPosition || null),