lecodes-viewer 1.1.0 → 1.2.0

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "lecodes-viewer",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "main": "src/createViewer.ts",
   "dependencies": {
-    "lecodes-renderer": "1.1.0",
+    "lecodes-renderer": "1.2.0",
     "ogl": "^1.0.11",
-    "lecodes-viewer-lite": "1.1.0"
+    "lecodes-viewer-lite": "1.2.0"
   },
   "scripts": {
     "dev": "vite",

package/src/ui/vListSystem.ts

@@ -1,212 +1,212 @@
-import type { UIScreen } from './UIScreen'
-
-type MountedItem = {
-    rootPtr: number       // detached yoga root айтема
-    el: HTMLElement       // DOM-корень поддерева
-    jsSubtree: any        // JS-объект поддерева (для null _id при unmount)
-}
-
-export type VListInstance = {
-    nodeId: number
-    el: HTMLElement
-    jsNode: any           // VListElement
-    screen: UIScreen
-    pendingScroll: number | null
-    items: Map<string, MountedItem>
-}
-
-export const createVListSystem = (module: any) => {
-
-    const instances = new Map<number, VListInstance>()   // yogaId vlist-ноды → instance
-
-    // ---------- marshaling ----------
-
-    const withKey = <R>(key: string, fn: (ptr: number) => R): R => {
-        const len = module.lengthBytesUTF8(key) + 1
-        const p = module._malloc(len)
-        module.stringToUTF8(key, p, len)
-        try { return fn(p) } finally { module._free(p) }
-    }
-
-    const withStringArray = <R>(arr: string[], fn: (arrPtr: number) => R): R => {
-        const ptrs = arr.map(s => {
-            const len = module.lengthBytesUTF8(s) + 1
-            const p = module._malloc(len)
-            module.stringToUTF8(s, p, len)
-            return p
-        })
-        const arrPtr = module._malloc(Math.max(4 * ptrs.length, 4))
-        ptrs.forEach((p, i) => { module.HEAPU32[(arrPtr >> 2) + i] = p })
-        try { return fn(arrPtr) } finally {
-            ptrs.forEach(p => module._free(p))
-            module._free(arrPtr)
-        }
-    }
-
-    const withFloatArray = <R>(arr: number[], fn: (ptr: number) => R): R => {
-        const p = module._malloc(Math.max(4 * arr.length, 4))
-        arr.forEach((v, i) => { module.HEAPF32[(p >> 2) + i] = v })
-        try { return fn(p) } finally { module._free(p) }
-    }
-
-    const readStringArray = (arrPtr: number, count: number): string[] => {
-        const out: string[] = []
-        for (let i = 0; i < count; i++) {
-            out.push(module.UTF8ToString(module.HEAPU32[(arrPtr >> 2) + i]))
-        }
-        return out
-    }
-
-    // ---------- layout-проход по айтемам ----------
-        
-    const refresh = (inst: VListInstance) => {
-        for (const [key, item] of inst.items) {
-            inst.screen.updateSizesFor(item.el)
-            item.el.style.top = withKey(key, p => module._vlistOffsetOf(inst.nodeId, p)) + "px"
-            item.el.style.left = "0px"
-        }
-        const h = module._getContentHeight(inst.nodeId)
-        inst.el.style.setProperty("--scroll-height", h + "px")
-        inst.el.style.setProperty("--scroll-width", "0px")
-
-        if (inst.pendingScroll !== null) {
-            if (Math.abs(inst.el.scrollTop - inst.pendingScroll) >= 1) {
-                inst.el.scrollTop = inst.pendingScroll   // высота уже выставлена — кламп не сработает
-            }
-            inst.pendingScroll = null
-        }
-    }
-
-    // ---------- колбэки из C++ (регистрируются один раз) ----------
-
-    // g_vlSync
-    const syncFunc = module.addFunction(
-        (_screenId: number, nodePtr: number, unmountArr: number, unmountCount: number, mountArr: number, mountCount: number) => {
-            const inst = instances.get(nodePtr)
-            if (!inst) return
-            const unmountKeys = readStringArray(unmountArr, unmountCount)
-            const mountKeys = readStringArray(mountArr, mountCount)
-
-            // Контракт: интеграционный слой сносит поддеревья ДО вызова JS _syncWindow
-            for (const key of unmountKeys) {
-                const item = inst.items.get(key)
-                if (!item) continue
-                inst.items.delete(key)
-                item.el.remove()
-                inst.screen.releaseSubtree(item.jsSubtree)            // nodeMap-чистка + _id = 0
-                withKey(key, p => module._vlistItemUnmounted(nodePtr, p))  // free yoga root
-            }
-
-            inst.jsNode._syncWindow(unmountKeys, mountKeys)           // mount: render() → vlistMount()
-            refresh(inst)
-        }, "viiiiii")
-
-    // g_vlAdjust — якорение / кламп
-    const adjustFunc = module.addFunction((_screenId: number, nodePtr: number, scrollY: number) => {
-        const inst = instances.get(nodePtr)
-        if (!inst) return
-        inst.pendingScroll = scrollY      // применим в refresh, после высоты
-    }, "viif")
-
-    // g_vlEdge
-    const edgeFunc = module.addFunction((_screenId: number, nodePtr: number, endEdge: number) => {
-        const inst = instances.get(nodePtr)
-        if (!inst) return
-        const listeners = endEdge ? (inst.jsNode.erl ?? []) : (inst.jsNode.strl ?? [])
-        for (const cb of listeners) cb()
-    }, "viii")
-
-    module._setVListHandlers(syncFunc, adjustFunc, edgeFunc)
-
-    // ---------- создание (из UIScreen.addNodeRecursive для type === "vlist") ----------
-
-    const register = (screen: UIScreen, jsNode: any, el: HTMLElement, yogaId: number) => {
-        const inst: VListInstance = { nodeId: yogaId, el, jsNode, screen, items: new Map(), pendingScroll: null }
-        instances.set(yogaId, inst)
-
-        module._vlistInit(yogaId, jsNode._overscan, jsNode._inverted ? 1 : 0,
-                          jsNode._startThreshold, jsNode._endThreshold)
-
-        if (jsNode._keys.length > 0) {
-            setKeysInternal(yogaId, jsNode._keys, jsNode._estimates)
-        }
-
-        el.addEventListener("scroll", () => {
-            module._vlistOnScroll(yogaId, el.scrollTop)
-            refresh(inst)
-            for (const cb of jsNode.sl ?? []) cb(el.scrollTop)
-        })
-    }
-
-    // Вызывается из UIScreen.updateSizes для vlist-элемента (после выставления его размеров)
-    const updateLayout = (yogaId: number) => {
-        const inst = instances.get(yogaId)
-        if (!inst) return
-        module._vlistUpdateLayout(yogaId)    // внутри может дернуть sync → mount
-        refresh(inst)
-    }
-
-    const unregister = (yogaId: number) => {
-        const inst = instances.get(yogaId)
-        if (!inst) return
-        module._vlistFree(yogaId)            // освобождает detached-корни
-        instances.delete(yogaId)
-    }
-
-    const setKeysInternal = (yogaId: number, keys: string[], estimates: number[]) => {
-        withStringArray(keys, kp =>
-            withFloatArray(estimates, ep =>
-                module._vlistSetKeys(yogaId, kp, ep, keys.length)))
-    }
-
-    // ---------- API для _creatorUI (зовётся из VListElement) ----------
-
-    const api = {
-        vlistSetKeys: (jsNode: any, keys: string[], estimates: number[]) => {
-            setKeysInternal(jsNode._id, keys, estimates)
-        },
-        vlistInsertKeys: (jsNode: any, index: number, keys: string[], estimates: number[]) => {
-            withStringArray(keys, kp =>
-                withFloatArray(estimates, ep =>
-                    module._vlistInsertKeys(jsNode._id, index, kp, ep, keys.length)))
-        },
-        vlistRemoveKeys: (jsNode: any, keys: string[]) => {
-            withStringArray(keys, kp => module._vlistRemoveKeys(jsNode._id, kp, keys.length))
-        },
-        vlistInvalidate: (jsNode: any, key: string) => {
-            withKey(key, p => module._vlistInvalidate(jsNode._id, p))
-        },
-        // Вызывается из _syncWindow на каждый mount-ключ
-        vlistMount: (jsNode: any, key: string, subtree: any) => {
-            const inst = instances.get(jsNode._id)
-            if (!inst) return
-            const rootPtr = withKey(key, p => module._vlistCreateItemRoot(jsNode._id, p))
-            const el = inst.screen.buildSubtree(subtree, rootPtr)     // addNodeRecursive в detached root
-            inst.el.appendChild(el)
-            inst.items.set(key, { rootPtr, el, jsSubtree: subtree })
-            withKey(key, p => module._vlistItemMounted(jsNode._id, p)) // измерение + кэш + якорение
-        },
-        command: (jsNode: any, name: string, ...args: any[]) => {
-            const inst = instances.get(jsNode._id)
-            if (!inst) return
-            const behavior = (animated: boolean) => animated ? "smooth" as const : "auto" as const
-            switch (name) {
-                case "scrollTo":
-                    inst.el.scrollTo({ top: args[0], behavior: behavior(args[1] ?? true) })
-                    break
-                case "scrollToKey": {
-                    const off = withKey(args[0], p => module._vlistOffsetOf(inst.nodeId, p))
-                    if (!isNaN(off)) inst.el.scrollTo({ top: off, behavior: behavior(args[1] ?? true) })
-                    break
-                }
-                case "scrollToEnd": {
-                    const h = module._getContentHeight(inst.nodeId)
-                    inst.el.scrollTo({ top: h - inst.el.clientHeight, behavior: behavior(args[0] ?? true) })
-                    break
-                }
-            }
-        },
-    }
-
-    return { register, updateLayout, unregister, refresh, api, instances }
+import type { UIScreen } from './UIScreen'
+
+type MountedItem = {
+    rootPtr: number       // detached yoga root айтема
+    el: HTMLElement       // DOM-корень поддерева
+    jsSubtree: any        // JS-объект поддерева (для null _id при unmount)
+}
+
+export type VListInstance = {
+    nodeId: number
+    el: HTMLElement
+    jsNode: any           // VListElement
+    screen: UIScreen
+    pendingScroll: number | null
+    items: Map<string, MountedItem>
+}
+
+export const createVListSystem = (module: any) => {
+
+    const instances = new Map<number, VListInstance>()   // yogaId vlist-ноды → instance
+
+    // ---------- marshaling ----------
+
+    const withKey = <R>(key: string, fn: (ptr: number) => R): R => {
+        const len = module.lengthBytesUTF8(key) + 1
+        const p = module._malloc(len)
+        module.stringToUTF8(key, p, len)
+        try { return fn(p) } finally { module._free(p) }
+    }
+
+    const withStringArray = <R>(arr: string[], fn: (arrPtr: number) => R): R => {
+        const ptrs = arr.map(s => {
+            const len = module.lengthBytesUTF8(s) + 1
+            const p = module._malloc(len)
+            module.stringToUTF8(s, p, len)
+            return p
+        })
+        const arrPtr = module._malloc(Math.max(4 * ptrs.length, 4))
+        ptrs.forEach((p, i) => { module.HEAPU32[(arrPtr >> 2) + i] = p })
+        try { return fn(arrPtr) } finally {
+            ptrs.forEach(p => module._free(p))
+            module._free(arrPtr)
+        }
+    }
+
+    const withFloatArray = <R>(arr: number[], fn: (ptr: number) => R): R => {
+        const p = module._malloc(Math.max(4 * arr.length, 4))
+        arr.forEach((v, i) => { module.HEAPF32[(p >> 2) + i] = v })
+        try { return fn(p) } finally { module._free(p) }
+    }
+
+    const readStringArray = (arrPtr: number, count: number): string[] => {
+        const out: string[] = []
+        for (let i = 0; i < count; i++) {
+            out.push(module.UTF8ToString(module.HEAPU32[(arrPtr >> 2) + i]))
+        }
+        return out
+    }
+
+    // ---------- layout-проход по айтемам ----------
+        
+    const refresh = (inst: VListInstance) => {
+        for (const [key, item] of inst.items) {
+            inst.screen.updateSizesFor(item.el)
+            item.el.style.top = withKey(key, p => module._vlistOffsetOf(inst.nodeId, p)) + "px"
+            item.el.style.left = "0px"
+        }
+        const h = module._getContentHeight(inst.nodeId)
+        inst.el.style.setProperty("--scroll-height", h + "px")
+        inst.el.style.setProperty("--scroll-width", "0px")
+
+        if (inst.pendingScroll !== null) {
+            if (Math.abs(inst.el.scrollTop - inst.pendingScroll) >= 1) {
+                inst.el.scrollTop = inst.pendingScroll   // высота уже выставлена — кламп не сработает
+            }
+            inst.pendingScroll = null
+        }
+    }
+
+    // ---------- колбэки из C++ (регистрируются один раз) ----------
+
+    // g_vlSync
+    const syncFunc = module.addFunction(
+        (_screenId: number, nodePtr: number, unmountArr: number, unmountCount: number, mountArr: number, mountCount: number) => {
+            const inst = instances.get(nodePtr)
+            if (!inst) return
+            const unmountKeys = readStringArray(unmountArr, unmountCount)
+            const mountKeys = readStringArray(mountArr, mountCount)
+
+            // Контракт: интеграционный слой сносит поддеревья ДО вызова JS _syncWindow
+            for (const key of unmountKeys) {
+                const item = inst.items.get(key)
+                if (!item) continue
+                inst.items.delete(key)
+                item.el.remove()
+                inst.screen.releaseSubtree(item.jsSubtree)            // nodeMap-чистка + _id = 0
+                withKey(key, p => module._vlistItemUnmounted(nodePtr, p))  // free yoga root
+            }
+
+            inst.jsNode._syncWindow(unmountKeys, mountKeys)           // mount: render() → vlistMount()
+            refresh(inst)
+        }, "viiiiii")
+
+    // g_vlAdjust — якорение / кламп
+    const adjustFunc = module.addFunction((_screenId: number, nodePtr: number, scrollY: number) => {
+        const inst = instances.get(nodePtr)
+        if (!inst) return
+        inst.pendingScroll = scrollY      // применим в refresh, после высоты
+    }, "viif")
+
+    // g_vlEdge
+    const edgeFunc = module.addFunction((_screenId: number, nodePtr: number, endEdge: number) => {
+        const inst = instances.get(nodePtr)
+        if (!inst) return
+        const listeners = endEdge ? (inst.jsNode.erl ?? []) : (inst.jsNode.strl ?? [])
+        for (const cb of listeners) cb()
+    }, "viii")
+
+    module._setVListHandlers(syncFunc, adjustFunc, edgeFunc)
+
+    // ---------- создание (из UIScreen.addNodeRecursive для type === "vlist") ----------
+
+    const register = (screen: UIScreen, jsNode: any, el: HTMLElement, yogaId: number) => {
+        const inst: VListInstance = { nodeId: yogaId, el, jsNode, screen, items: new Map(), pendingScroll: null }
+        instances.set(yogaId, inst)
+
+        module._vlistInit(yogaId, jsNode._overscan, jsNode._inverted ? 1 : 0,
+                          jsNode._startThreshold, jsNode._endThreshold)
+
+        if (jsNode._keys.length > 0) {
+            setKeysInternal(yogaId, jsNode._keys, jsNode._estimates)
+        }
+
+        el.addEventListener("scroll", () => {
+            module._vlistOnScroll(yogaId, el.scrollTop)
+            refresh(inst)
+            for (const cb of jsNode.sl ?? []) cb(el.scrollTop)
+        })
+    }
+
+    // Вызывается из UIScreen.updateSizes для vlist-элемента (после выставления его размеров)
+    const updateLayout = (yogaId: number) => {
+        const inst = instances.get(yogaId)
+        if (!inst) return
+        module._vlistUpdateLayout(yogaId)    // внутри может дернуть sync → mount
+        refresh(inst)
+    }
+
+    const unregister = (yogaId: number) => {
+        const inst = instances.get(yogaId)
+        if (!inst) return
+        module._vlistFree(yogaId)            // освобождает detached-корни
+        instances.delete(yogaId)
+    }
+
+    const setKeysInternal = (yogaId: number, keys: string[], estimates: number[]) => {
+        withStringArray(keys, kp =>
+            withFloatArray(estimates, ep =>
+                module._vlistSetKeys(yogaId, kp, ep, keys.length)))
+    }
+
+    // ---------- API для _creatorUI (зовётся из VListElement) ----------
+
+    const api = {
+        vlistSetKeys: (jsNode: any, keys: string[], estimates: number[]) => {
+            setKeysInternal(jsNode._id, keys, estimates)
+        },
+        vlistInsertKeys: (jsNode: any, index: number, keys: string[], estimates: number[]) => {
+            withStringArray(keys, kp =>
+                withFloatArray(estimates, ep =>
+                    module._vlistInsertKeys(jsNode._id, index, kp, ep, keys.length)))
+        },
+        vlistRemoveKeys: (jsNode: any, keys: string[]) => {
+            withStringArray(keys, kp => module._vlistRemoveKeys(jsNode._id, kp, keys.length))
+        },
+        vlistInvalidate: (jsNode: any, key: string) => {
+            withKey(key, p => module._vlistInvalidate(jsNode._id, p))
+        },
+        // Вызывается из _syncWindow на каждый mount-ключ
+        vlistMount: (jsNode: any, key: string, subtree: any) => {
+            const inst = instances.get(jsNode._id)
+            if (!inst) return
+            const rootPtr = withKey(key, p => module._vlistCreateItemRoot(jsNode._id, p))
+            const el = inst.screen.buildSubtree(subtree, rootPtr)     // addNodeRecursive в detached root
+            inst.el.appendChild(el)
+            inst.items.set(key, { rootPtr, el, jsSubtree: subtree })
+            withKey(key, p => module._vlistItemMounted(jsNode._id, p)) // измерение + кэш + якорение
+        },
+        command: (jsNode: any, name: string, ...args: any[]) => {
+            const inst = instances.get(jsNode._id)
+            if (!inst) return
+            const behavior = (animated: boolean) => animated ? "smooth" as const : "auto" as const
+            switch (name) {
+                case "scrollTo":
+                    inst.el.scrollTo({ top: args[0], behavior: behavior(args[1] ?? true) })
+                    break
+                case "scrollToKey": {
+                    const off = withKey(args[0], p => module._vlistOffsetOf(inst.nodeId, p))
+                    if (!isNaN(off)) inst.el.scrollTo({ top: off, behavior: behavior(args[1] ?? true) })
+                    break
+                }
+                case "scrollToEnd": {
+                    const h = module._getContentHeight(inst.nodeId)
+                    inst.el.scrollTo({ top: h - inst.el.clientHeight, behavior: behavior(args[0] ?? true) })
+                    break
+                }
+            }
+        },
+    }
+
+    return { register, updateLayout, unregister, refresh, api, instances }
 }