@nocobase/client-v2 2.2.0-alpha.7 → 2.2.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client-v2",
-  "version": "2.2.0-alpha.7",
+  "version": "2.2.0-beta.10",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -27,11 +27,11 @@
     "@formily/antd-v5": "1.2.3",
     "@formily/react": "^2.2.27",
     "@formily/shared": "^2.2.27",
-    "@nocobase/evaluators": "2.2.0-alpha.7",
-    "@nocobase/flow-engine": "2.2.0-alpha.7",
-    "@nocobase/sdk": "2.2.0-alpha.7",
-    "@nocobase/shared": "2.2.0-alpha.7",
-    "@nocobase/utils": "2.2.0-alpha.7",
+    "@nocobase/evaluators": "2.2.0-beta.10",
+    "@nocobase/flow-engine": "2.2.0-beta.10",
+    "@nocobase/sdk": "2.2.0-beta.10",
+    "@nocobase/shared": "2.2.0-beta.10",
+    "@nocobase/utils": "2.2.0-beta.10",
     "ahooks": "^3.7.2",
     "antd": "5.24.2",
     "antd-style": "3.7.1",
@@ -42,10 +42,9 @@
     "html5-qrcode": "^2.3.8",
     "i18next": "^22.4.9",
     "json5": "^2.2.3",
-    "jsqr": "^1.4.0",
     "lodash": "4.17.21",
     "react-i18next": "^11.15.1",
     "react-router-dom": "^6.30.1"
   },
-  "gitHead": "34ba02960fca9ab0b6881d3db7040a8a64067bba"
+  "gitHead": "d572beec24de46df948f28db72b25303a63bf62d"
 }

package/src/BaseApplication.tsx

@@ -81,10 +81,6 @@ const trimTrailingSlashes = (value: string) => {
   return match ? value.slice(0, -match[0].length) : value;
 };
 
-const ensureTrailingSlash = (value: string) => {
-  return `${trimTrailingSlashes(value)}/`;
-};
-
 const isRenderableComponentType = (value: unknown): value is AnyComponent => isValidElementType(value);
 
 export type DevDynamicImport = (packageName: string) => Promise<{ default: PluginClass }>;
@@ -438,11 +434,15 @@ export abstract class BaseApplication<
   }
 
   getCdnUrl() {
-    return ensureTrailingSlash(window['__webpack_public_path__'] || this.getPublicPath());
+    return window['__webpack_public_path__'] || this.getPublicPath();
   }
 
   getPublicPath() {
-    return ensureTrailingSlash(this.options.publicPath || '/');
+    let publicPath = this.options.publicPath || '/';
+    if (!publicPath.endsWith('/')) {
+      publicPath += '/';
+    }
+    return publicPath;
   }
 
   getApiUrl(pathname = '') {

package/src/__tests__/app.test.tsx

@@ -34,7 +34,6 @@ describe('app', () => {
     afterEach(() => {
       document.querySelectorAll('link[rel="shortcut icon"]').forEach((node) => node.remove());
       document.documentElement.removeAttribute('lang');
-      delete window['__webpack_public_path__'];
       vi.restoreAllMocks();
     });
 
@@ -59,31 +58,6 @@ describe('app', () => {
       expect(app.jsonLogic.apply({ $testAlwaysTrue: [] })).toBe(true);
     });
 
-    it('should normalize publicPath and webpack public path with a single trailing slash', () => {
-      const app = new Application({
-        router,
-        publicPath: '/admin//',
-      });
-
-      expect(app.getPublicPath()).toBe('/admin/');
-
-      window['__webpack_public_path__'] = '/cdn/assets///';
-      expect(app.getCdnUrl()).toBe('/cdn/assets/');
-
-      delete window['__webpack_public_path__'];
-      expect(app.getCdnUrl()).toBe('/admin/');
-    });
-
-    it('should normalize webpack public path without a trailing slash', () => {
-      const app = new Application({
-        router,
-        publicPath: '/admin/',
-      });
-
-      window['__webpack_public_path__'] = '/cdn/assets';
-      expect(app.getCdnUrl()).toBe('/cdn/assets/');
-    });
-
     it('should apply the provided favicon immediately', () => {
       const app = new Application({ router });
 

package/src/__tests__/browserChecker.test.ts

@@ -15,8 +15,6 @@ import { fileURLToPath } from 'node:url';
 type BrowserCheckerCase = {
   pathname: string;
   publicPath: string;
-  modernClientPrefix?: string;
-  appClientEntryMode?: string;
   expectedRedirect?: string;
 };
 
@@ -42,8 +40,6 @@ function executeBrowserChecker(scriptPath: string, input: BrowserCheckerCase) {
     showLog: false,
     window: {
       __nocobase_public_path__: input.publicPath,
-      __nocobase_modern_client_prefix__: input.modernClientPrefix,
-      __nocobase_app_client_entry_mode__: input.appClientEntryMode,
       location: {
         origin: 'http://c.local.nocobase.com',
         pathname: input.pathname,
@@ -113,61 +109,4 @@ describe.each(browserCheckerCases)('$label', ({ scriptPath }) => {
 
     expect(replace).not.toHaveBeenCalled();
   });
-
-  if (scriptPath.includes('/app/client/public/')) {
-    it('redirects app root to modern entry for modern-default', () => {
-      const replace = executeBrowserChecker(scriptPath, {
-        pathname: '/',
-        publicPath: '/',
-        modernClientPrefix: 'v',
-        appClientEntryMode: 'modern-default',
-      });
-
-      expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/v/');
-    });
-
-    it('does not redirect legacy deep links for modern-default', () => {
-      const replace = executeBrowserChecker(scriptPath, {
-        pathname: '/admin',
-        publicPath: '/',
-        modernClientPrefix: 'v',
-        appClientEntryMode: 'modern-default',
-      });
-
-      expect(replace).not.toHaveBeenCalled();
-    });
-
-    it('rewrites legacy document paths for modern-only', () => {
-      const replace = executeBrowserChecker(scriptPath, {
-        pathname: '/admin/settings/workflow',
-        publicPath: '/',
-        modernClientPrefix: 'v',
-        appClientEntryMode: 'modern-only',
-      });
-
-      expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/v/admin/settings/workflow');
-    });
-
-    it('redirects sub-path site root directly to final modern target', () => {
-      const replace = executeBrowserChecker(scriptPath, {
-        pathname: '/nocobase/',
-        publicPath: '/nocobase/',
-        modernClientPrefix: 'v',
-        appClientEntryMode: 'modern-default',
-      });
-
-      expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/nocobase/v/');
-    });
-
-    it('rewrites sub-app legacy deep links for modern-only without collapsing the sub-app segment', () => {
-      const replace = executeBrowserChecker(scriptPath, {
-        pathname: '/nocobase/apps/a_31itq60q4kg/admin/',
-        publicPath: '/nocobase/',
-        modernClientPrefix: 'v',
-        appClientEntryMode: 'modern-only',
-      });
-
-      expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/nocobase/v/apps/a_31itq60q4kg/admin');
-    });
-  }
 });

package/src/components/README.md

@@ -190,10 +190,6 @@ import { TypedVariableInput } from '@nocobase/client-v2';
 <Form.Item name={['options', 'secure']} label={t('Secure')} initialValue={true}>
   <TypedVariableInput types={['boolean']} namespaces={['$env']} />
 </Form.Item>
-
-// Inject a custom variable tree (e.g. a workflow node's upstream outputs,
-// which are not in the global registry)
-<TypedVariableInput types={['string', 'number']} metaTree={workflowMetaTree} />
 ```
 
 Key props:
@@ -201,7 +197,6 @@ Key props:
 - `types`: allowed constant types. Shape mirrors v1 `useTypedConstant` — pass bare type names (`['number', 'boolean']`) or `[type, editorProps]` tuples (`[['number', { min, max, step }]]`) to forward props to the underlying antd editor. Defaults to `['string', 'number', 'boolean', 'date']`. **Even when only one type is allowed, the `Constant` entry still expands into a typed submenu** (Number / Boolean / Date / String) — matches v1 so users can see what type the constant is
 - `namespaces`: restrict the variable picker to specific top-level namespaces (e.g. `['$env']`). Omit to expose every namespace registered on `flowEngine.context`
 - `extraNodes`: static leaves appended after the namespace-filtered nodes
-- `metaTree`: **inject the variable tree directly** instead of reading the global `flowEngine.context` meta tree. When set, `namespaces`/`extraNodes` are ignored and this tree is used verbatim — for context-scoped variable sources that are not in the global registry (typically a workflow node's upstream outputs, `$jobsMapByNodeKey`). Nodes whose `children` is a thunk (`() => Promise<MetaTreeNode[]>`) are **lazy-loaded on expand** (via flow-engine's `loadMetaTreeChildren`)
 - `nullable`: whether to expose the `Null` switcher entry. Default `true`. Combined with `Form.Item.rules={[{ required: true }]}`, the user can explicitly clear the field but submission is still blocked by validation — mirrors v1's "Null + required" pairing
 - `delimiters`: variable-token delimiters, default `['{{', '}}']` — same as `VariableInput`
 - `value` / `onChange` / `placeholder` / `disabled` / `style` / `className`: standard controlled-input props
@@ -217,10 +212,9 @@ When **not** to use it:
 - **Pure literal fields** (users will never pass a variable) → use the antd primitive directly (`InputNumber` / `Select` / `DatePicker` / `Input`) and skip the Cascader column overhead
 - **Pure variable fields** (users will never pass a literal) → use `EnvVariableInput` (`$env`-only, with optional password masking) or `VariableInput` (general-purpose)
 
-Supported constant types: `string` / `number` / `boolean` / `date` / `object`. The `object` (JSON) type renders an inline monospace textarea (2 rows by default, drag-resizable) — it keeps the raw text as a draft while editing and `JSON.parse`s it back into an object on blur. On a parse failure it shows the raw `JSON.parse` message (e.g. `Expected property name or '}' in JSON at position …`, matching v1) on its own row below the input, and does not emit. Mirrors v1 `useTypedConstant`'s object form (default value `{}`).
-
 Capabilities skipped (present in v1, not yet ported to v2):
 
+- `object` constant type (JSON editor) — v2 has no inline "JSON editor + Cascader switcher" yet; add when there's a concrete caller
 - Async `loadChildren` cascading — most MetaTree namespaces are already eagerly resolved by `useFilteredMetaTree`, so this hasn't been needed
 
 #### FileSizeInput

package/src/components/README.zh-CN.md

@@ -190,9 +190,6 @@ import { TypedVariableInput } from '@nocobase/client-v2';
 <Form.Item name={['options', 'secure']} label={t('安全模式')} initialValue={true}>
   <TypedVariableInput types={['boolean']} namespaces={['$env']} />
 </Form.Item>
-
-// 注入自定义变量树（如工作流节点的上游输出，不在全局注册表里）
-<TypedVariableInput types={['string', 'number']} metaTree={workflowMetaTree} />
 ```
 
 主要属性：
@@ -200,7 +197,6 @@ import { TypedVariableInput } from '@nocobase/client-v2';
 - `types`：允许的常量类型。形态对齐 v1 `useTypedConstant`，可以传裸类型名 `['number', 'boolean']`，也可以传 `[type, editorProps]` 元组 `[['number', { min, max, step }]]` 把 props 透传给底层 antd 编辑器。默认 `['string', 'number', 'boolean', 'date']`。**即使只允许一种类型，「常量」入口也会展开二级菜单**（数字 / 逻辑值 / 日期 / 字符串）——跟 v1 一致，让用户能直观看到当前常量是什么类型
 - `namespaces`：限定变量 picker 可选的顶层命名空间（如 `['$env']`）。不传就用 `flowEngine.context` 里所有已注册命名空间
 - `extraNodes`：在命名空间过滤后追加几条静态变量节点
-- `metaTree`：**直接注入变量树**，取代读取全局 `flowEngine.context` 的 MetaTree。传了它就**忽略** `namespaces`/`extraNodes`，原样使用这棵树——用于不在全局注册表里的、上下文相关的变量源（典型如工作流节点的上游节点输出 `$jobsMapByNodeKey`）。树里 `children` 为函数（`() => Promise<MetaTreeNode[]>`）的节点会在用户展开 Cascader 时**按需懒加载**（复用 flow-engine 的 `loadMetaTreeChildren`）
 - `nullable`：是否暴露「空值」入口，默认 `true`。配合 `Form.Item.rules={[{ required: true }]}` 可以让用户能手动清空、但提交时会被校验拦截——跟 v1 的「空值 + required」组合一致
 - `delimiters`：变量 token 开闭分隔符，默认 `['{{', '}}']`，跟 `VariableInput` 一致
 - `value` / `onChange` / `placeholder` / `disabled` / `style` / `className`：标准受控字段属性
@@ -216,10 +212,9 @@ import { TypedVariableInput } from '@nocobase/client-v2';
 - **纯字面量字段**（用户不会想填变量）→ 直接用 antd `InputNumber` / `Select` / `DatePicker` / `Input`，省掉 Cascader 那一格的视觉开销
 - **纯变量字段**（用户不会想填字面量）→ 用 `EnvVariableInput`（`$env` 专用，带 password mask）或 `VariableInput`（更通用）
 
-支持的常量类型：`string` / `number` / `boolean` / `date` / `object`。其中 `object`（即 JSON）渲染为一个等宽字体的内联 textarea（默认两行、可拖拽拉伸），编辑时保留原始文本草稿、失焦（blur）时 `JSON.parse` 回写为对象；解析失败则在输入框**下方单独一行**显示原生 `JSON.parse` 的错误信息（如 `Expected property name or '}' in JSON at position …`，对齐 v1）且不回写。对齐 v1 `useTypedConstant` 的 object 形态（默认值 `{}`）。
-
 跳过的能力（v1 有但 v2 还没补）：
 
+- `object` 类型（JSON 编辑器）——v2 还没对应的「内联 JSON 编辑器 + Cascader 切换」组件，等真有需求再补
 - 异步 `loadChildren` 分支——大多数命名空间的 MetaTree 已经由 `useFilteredMetaTree` 提前展平，没遇到刚需
 
 #### FileSizeInput

package/src/components/form/JsonTextArea.tsx

@@ -117,10 +117,6 @@ const JsonTextAreaComponent = React.forwardRef<TextAreaRef, JsonTextAreaProps>((
   return (
     <>
       <Input.TextArea
-        autoSize={{
-          minRows: 5,
-          maxRows: 10,
-        }}
         {...textAreaProps}
         ref={ref}
         value={text}

package/src/components/form/ScanInput/__tests__/useCodeScanner.test.tsx

@@ -7,9 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { render, waitFor } from '@testing-library/react';
 import React, { useCallback } from 'react';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { DEFAULT_CODE_FORMATS, getCodeScanBoxSize, useCodeScanner } from '../useCodeScanner';
 
 type MockScannerInstance = {
@@ -44,12 +44,6 @@ const mocks = vi.hoisted(() => {
   };
 });
 
-const jsQrMocks = vi.hoisted(() => {
-  return {
-    default: vi.fn(),
-  };
-});
-
 vi.mock('html5-qrcode', () => ({
   Html5Qrcode: mocks.Html5Qrcode,
   Html5QrcodeScannerState: {
@@ -72,8 +66,6 @@ vi.mock('html5-qrcode', () => ({
   },
 }));
 
-vi.mock('jsqr', () => jsQrMocks);
-
 function ScannerHost({ scanBoxSize }: { scanBoxSize?: { width: number; height: number } } = {}) {
   const handleScanSuccess = useCallback(() => undefined, []);
 
@@ -87,74 +79,9 @@ function ScannerHost({ scanBoxSize }: { scanBoxSize?: { width: number; height: n
   return <div id="scanner" />;
 }
 
-function FileScannerHost({ onScanSuccess }: { onScanSuccess: (text: string) => void }) {
-  const { startScanFile } = useCodeScanner({
-    elementId: 'scanner',
-    enabled: true,
-    onScanSuccess,
-  });
-
-  return (
-    <>
-      <div id="scanner" />
-      <button onClick={() => startScanFile(new File(['qr'], 'qr.png', { type: 'image/png' }))}>scan file</button>
-    </>
-  );
-}
-
-function stubSafariBrowser() {
-  vi.spyOn(window.navigator, 'vendor', 'get').mockReturnValue('Apple Computer, Inc.');
-  vi.spyOn(window.navigator, 'userAgent', 'get').mockReturnValue(
-    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15',
-  );
-}
-
-function stubImageElement(size: { width: number; height: number } = { width: 600, height: 400 }) {
-  vi.stubGlobal(
-    'Image',
-    class MockImage {
-      onabort: ((event: Event) => void) | null = null;
-      onerror: ((event: Event) => void) | null = null;
-      onload: (() => void) | null = null;
-      height = size.height;
-      naturalHeight = size.height;
-      naturalWidth = size.width;
-      width = size.width;
-
-      set src(_value: string) {
-        this.onload?.();
-      }
-    },
-  );
-  vi.stubGlobal('URL', {
-    ...URL,
-    createObjectURL: vi.fn(() => 'blob:qr'),
-    revokeObjectURL: vi.fn(),
-  });
-}
-
-function stubCanvas() {
-  const canvasContext = {
-    drawImage: vi.fn(),
-    getImageData: vi.fn((_x: number, _y: number, width: number, height: number) => ({
-      data: new Uint8ClampedArray(width * height * 4),
-      height,
-      width,
-    })),
-  } as unknown as CanvasRenderingContext2D;
-
-  vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue(canvasContext);
-}
-
 describe('useCodeScanner', () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    jsQrMocks.default.mockReturnValue(undefined);
-  });
-
-  afterEach(() => {
-    vi.unstubAllGlobals();
-    vi.restoreAllMocks();
   });
 
   it('starts scanning with QR code and barcode formats by default', async () => {
@@ -193,74 +120,4 @@ describe('useCodeScanner', () => {
 
     expect(config?.qrbox?.(1200, 844)).toEqual({ width: 319, height: 240 });
   });
-
-  it('uses jsQR first for Safari uploaded QR images', async () => {
-    const handleScanSuccess = vi.fn();
-    jsQrMocks.default.mockReturnValueOnce({ data: 'JSQR-CODE' });
-    stubSafariBrowser();
-    stubImageElement();
-    stubCanvas();
-
-    render(<FileScannerHost onScanSuccess={handleScanSuccess} />);
-    await waitFor(() => expect(mocks.start).toHaveBeenCalled());
-
-    fireEvent.click(screen.getByText('scan file'));
-
-    await waitFor(() => expect(handleScanSuccess).toHaveBeenCalledWith('JSQR-CODE'));
-    expect(jsQrMocks.default).toHaveBeenCalledWith(expect.any(Uint8ClampedArray), 600, 400, {
-      inversionAttempts: 'attemptBoth',
-    });
-    expect(mocks.scanFileV2).not.toHaveBeenCalled();
-  });
-
-  it('falls back to html5-qrcode for Safari uploaded files when jsQR does not decode a QR code', async () => {
-    const handleScanSuccess = vi.fn();
-    mocks.scanFileV2.mockResolvedValueOnce({ decodedText: 'BARCODE-CODE' });
-    stubSafariBrowser();
-    stubImageElement();
-    stubCanvas();
-
-    render(<FileScannerHost onScanSuccess={handleScanSuccess} />);
-    await waitFor(() => expect(mocks.start).toHaveBeenCalled());
-
-    fireEvent.click(screen.getByText('scan file'));
-
-    await waitFor(() => expect(handleScanSuccess).toHaveBeenCalledWith('BARCODE-CODE'));
-    expect(jsQrMocks.default).toHaveBeenCalled();
-    expect(mocks.scanFileV2).toHaveBeenCalled();
-  });
-
-  it('tries multiple image scales before falling back from Safari jsQR scanning', async () => {
-    const handleScanSuccess = vi.fn();
-    Array.from({ length: 8 }).forEach((_, index) => {
-      jsQrMocks.default.mockReturnValueOnce(index === 7 ? { data: 'SCALED-CODE' } : undefined);
-    });
-    stubSafariBrowser();
-    stubImageElement({ width: 4000, height: 3000 });
-    stubCanvas();
-
-    render(<FileScannerHost onScanSuccess={handleScanSuccess} />);
-    await waitFor(() => expect(mocks.start).toHaveBeenCalled());
-
-    fireEvent.click(screen.getByText('scan file'));
-
-    await waitFor(() => expect(handleScanSuccess).toHaveBeenCalledWith('SCALED-CODE'));
-    expect(jsQrMocks.default).toHaveBeenCalledTimes(8);
-  });
-
-  it('tries enhanced grayscale QR images for blurry Safari uploads', async () => {
-    const handleScanSuccess = vi.fn();
-    jsQrMocks.default.mockReturnValueOnce(undefined).mockReturnValueOnce({ data: 'ENHANCED-CODE' });
-    stubSafariBrowser();
-    stubImageElement();
-    stubCanvas();
-
-    render(<FileScannerHost onScanSuccess={handleScanSuccess} />);
-    await waitFor(() => expect(mocks.start).toHaveBeenCalled());
-
-    fireEvent.click(screen.getByText('scan file'));
-
-    await waitFor(() => expect(handleScanSuccess).toHaveBeenCalledWith('ENHANCED-CODE'));
-    expect(jsQrMocks.default).toHaveBeenCalledTimes(2);
-  });
 });

package/src/components/form/ScanInput/useCodeScanner.ts

@@ -8,7 +8,6 @@
  */
 
 import { Html5Qrcode, Html5QrcodeScannerState, Html5QrcodeSupportedFormats } from 'html5-qrcode';
-import jsQR from 'jsqr';
 import { useCallback, useEffect, useState } from 'react';
 import type { CodeFormatsToSupport } from './types';
 
@@ -27,27 +26,6 @@ type UseCodeScannerOptions = {
   onScanFailure?: () => void;
 };
 
-type ImageDataVariant = {
-  imageData: ImageData;
-  maxSize: number;
-};
-
-type JsQRImageTransform = {
-  contrast?: number;
-  threshold?: number;
-};
-
-const QR_SCAN_IMAGE_SIZES = [3200, 2400, 1600, 1000];
-const QR_SCAN_IMAGE_TRANSFORMS: JsQRImageTransform[] = [
-  {},
-  { contrast: 3, threshold: 105 },
-  { contrast: 2, threshold: 105 },
-  { contrast: 3, threshold: 120 },
-  { contrast: 2, threshold: 120 },
-  { contrast: 3, threshold: 90 },
-  { contrast: 4, threshold: 105 },
-];
-
 export const DEFAULT_CODE_FORMATS: CodeFormatsToSupport = [
   Html5QrcodeSupportedFormats.QR_CODE,
   Html5QrcodeSupportedFormats.CODE_128,
@@ -84,126 +62,6 @@ async function stopScanner(scanner?: Html5Qrcode, options: { clear?: boolean } =
   }
 }
 
-function isSafariBrowser() {
-  const { userAgent, vendor } = navigator;
-  return /Apple/i.test(vendor) && /Safari/i.test(userAgent) && !/CriOS|FxiOS|EdgiOS|Chrome/i.test(userAgent);
-}
-
-function loadImage(file: File) {
-  return new Promise<HTMLImageElement>((resolve, reject) => {
-    const image = new Image();
-    const url = URL.createObjectURL(file);
-    const cleanup = () => URL.revokeObjectURL(url);
-
-    image.onload = () => {
-      cleanup();
-      resolve(image);
-    };
-    image.onerror = (event) => {
-      cleanup();
-      reject(event);
-    };
-    image.onabort = (event) => {
-      cleanup();
-      reject(event);
-    };
-    image.src = url;
-  });
-}
-
-function getScanImageSizes(naturalWidth: number, naturalHeight: number) {
-  const maxSize = Math.max(naturalWidth, naturalHeight);
-  const cappedMaxSize = Math.min(maxSize, QR_SCAN_IMAGE_SIZES[0]);
-  return Array.from(new Set([cappedMaxSize, ...QR_SCAN_IMAGE_SIZES.filter((size) => size < cappedMaxSize)])).sort(
-    (a, b) => b - a,
-  );
-}
-
-function getImageDataFromImage(image: HTMLImageElement, maxSize: number): ImageDataVariant | undefined {
-  const naturalWidth = image.naturalWidth || image.width;
-  const naturalHeight = image.naturalHeight || image.height;
-
-  const scale = Math.min(1, maxSize / Math.max(naturalWidth, naturalHeight));
-  const width = Math.max(1, Math.round(naturalWidth * scale));
-  const height = Math.max(1, Math.round(naturalHeight * scale));
-  const canvas = document.createElement('canvas');
-  canvas.width = width;
-  canvas.height = height;
-  const context = canvas.getContext('2d');
-  if (!context) {
-    return;
-  }
-
-  context.drawImage(image, 0, 0, width, height);
-  return {
-    imageData: context.getImageData(0, 0, width, height),
-    maxSize,
-  };
-}
-
-async function getImageDataVariants(file: File) {
-  const image = await loadImage(file);
-  const naturalWidth = image.naturalWidth || image.width;
-  const naturalHeight = image.naturalHeight || image.height;
-
-  if (!naturalWidth || !naturalHeight) {
-    return;
-  }
-
-  return getScanImageSizes(naturalWidth, naturalHeight)
-    .map((maxSize) => getImageDataFromImage(image, maxSize))
-    .filter((variant): variant is ImageDataVariant => !!variant);
-}
-
-function getTransformedImageData(imageData: ImageData, transform: JsQRImageTransform) {
-  const { contrast = 1, threshold } = transform;
-  if (contrast === 1 && threshold == null) {
-    return imageData.data;
-  }
-
-  const data = new Uint8ClampedArray(imageData.data);
-  for (let index = 0; index < data.length; index += 4) {
-    let luminance = data[index] * 0.299 + data[index + 1] * 0.587 + data[index + 2] * 0.114;
-    luminance = Math.max(0, Math.min(255, (luminance - 128) * contrast + 128));
-    if (threshold != null) {
-      luminance = luminance < threshold ? 0 : 255;
-    }
-    data[index] = luminance;
-    data[index + 1] = luminance;
-    data[index + 2] = luminance;
-  }
-  return data;
-}
-
-async function scanFileWithJsQR(file: File, formatsToSupport?: CodeFormatsToSupport) {
-  const formats = formatsToSupport?.length ? formatsToSupport : DEFAULT_CODE_FORMATS;
-  if (!formats.includes(Html5QrcodeSupportedFormats.QR_CODE)) {
-    throw new Error('QR_CODE is not included in the requested formats');
-  }
-
-  const variants = await getImageDataVariants(file);
-  if (!variants?.length) {
-    throw new Error('Failed to prepare uploaded image for QR decoding');
-  }
-
-  for (const { imageData } of variants) {
-    for (const transform of QR_SCAN_IMAGE_TRANSFORMS) {
-      const data = getTransformedImageData(imageData, transform);
-      const qrCode = jsQR(data, imageData.width, imageData.height, { inversionAttempts: 'attemptBoth' });
-      if (qrCode?.data) {
-        return qrCode.data;
-      }
-    }
-  }
-
-  throw new Error('No QR code decoded by jsQR');
-}
-
-function shouldScanQrWithJsQR(formatsToSupport?: CodeFormatsToSupport) {
-  const formats = formatsToSupport?.length ? formatsToSupport : DEFAULT_CODE_FORMATS;
-  return formats.includes(Html5QrcodeSupportedFormats.QR_CODE);
-}
-
 export function useCodeScanner({
   enabled,
   elementId,
@@ -237,16 +95,6 @@ export function useCodeScanner({
 
   const startScanFile = useCallback(
     async (file: File) => {
-      if (isSafariBrowser() && shouldScanQrWithJsQR(formatsToSupport)) {
-        try {
-          const decodedText = await scanFileWithJsQR(file, formatsToSupport);
-          onScanSuccess(decodedText);
-          return;
-        } catch {
-          // Fall through to html5-qrcode so barcode uploads still work in Safari.
-        }
-      }
-
       if (!scanner) {
         return;
       }
@@ -255,12 +103,12 @@ export function useCodeScanner({
       try {
         const result = await scanner.scanFileV2(file, false);
         onScanSuccess(result.decodedText);
-      } catch {
+      } catch (error) {
         onScanFailure?.();
         await startScanCamera(scanner);
       }
     },
-    [formatsToSupport, onScanFailure, onScanSuccess, scanner, startScanCamera],
+    [onScanFailure, onScanSuccess, scanner, startScanCamera],
   );
 
   useEffect(() => {