@lvce-editor/virtual-dom 1.17.0 → 1.19.0

package/README.md

@@ -1 +1 @@
-# virtual dom
+# virtual dom

package/dist/index.js

@@ -385,6 +385,13 @@ var setProp = ($Element, key, value, eventMap, newEventMap) => {
         $Element.removeAttribute("aria-owns");
       }
       break;
+    case "ariaActivedescendant":
+      if (value) {
+        $Element.setAttribute("aria-activedescendant", value);
+      } else {
+        $Element.removeAttribute("aria-activedescendant");
+      }
+      break;
     case "ariaControls":
       $Element.setAttribute("aria-controls", value);
       break;
@@ -561,6 +568,10 @@ var getEventListenerArg = (param, event) => {
       return event.button;
     case "event.target.value":
       return event.target.value;
+    case "event.isTrusted":
+      return event.isTrusted;
+    case "event.target.className":
+      return event.target.className;
     case "event.data":
       return event.data;
     case "event.deltaMode":
@@ -587,8 +598,6 @@ var getEventListenerArg = (param, event) => {
       return event.shiftKey;
     case "event.inputType":
       return event.inputType;
-    case "event.data":
-      return event.data;
     default:
       return param;
   }
@@ -639,6 +648,11 @@ var getEventListenerMap = (id) => {
   return map;
 };
 
+// src/parts/QueryInputs/QueryInputs.ts
+var queryInputs = ($Viewlet) => {
+  return [...$Viewlet.querySelectorAll("input, textarea")];
+};
+
 // src/parts/ClearNode/ClearNode.ts
 var clearNode = ($Node) => {
   $Node.textContent = "";
@@ -656,9 +670,6 @@ var render2 = (elements, eventMap = {}, newEventMap = {}) => {
 };
 
 // src/parts/RememberFocus/RememberFocus.ts
-var queryInputs = ($Viewlet) => {
-  return [...$Viewlet.querySelectorAll("input, textarea")];
-};
 var rememberFocus = ($Viewlet, dom, eventMap, uid = 0) => {
   const oldLeft = $Viewlet.style.left;
   const oldTop = $Viewlet.style.top;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/virtual-dom",
-  "version": "1.17.0",
+  "version": "1.19.0",
   "main": "dist/index.js",
   "type": "module",
   "keywords": [],

package/src/parts/AttachEvent/AttachEvent.ts

@@ -1,7 +1,7 @@
 import * as GetEventListenerOptions from '../GetEventListenerOptions/GetEventListenerOptions.ts'
 import * as GetWrappedListener from '../GetWrappedListener/GetWrappedListener.ts'
 
-const getOptions = (fn: any) => {
+const getOptions = (fn: any): any => {
   if (fn.passive) {
     return {
       passive: true,
@@ -16,7 +16,7 @@ export const attachEvent = (
   key: string,
   value: string,
   newEventMap?: any,
-) => {
+): void => {
   if (newEventMap && newEventMap[value]) {
     const fn = newEventMap[value]
     const options: any = getOptions(fn)

package/src/parts/ComponentUid/ComponentUid.ts

@@ -1,11 +1,11 @@
 import { getUidTarget } from '../GetUidTarget/GetUidTarget.ts'
 import { uidSymbol } from '../UidSymbol/UidSymbol.ts'
 
-export const setComponentUid = ($Element, uid) => {
+export const setComponentUid = ($Element, uid): void => {
   $Element[uidSymbol] = uid
 }
 
-export const getComponentUid = ($Element) => {
+export const getComponentUid = ($Element): number => {
   const $Target = getUidTarget($Element)
   if (!$Target) {
     return 0
@@ -13,7 +13,7 @@ export const getComponentUid = ($Element) => {
   return $Target[uidSymbol]
 }
 
-export const getComponentUidFromEvent = (event) => {
+export const getComponentUidFromEvent = (event): number => {
   const { target, currentTarget } = event
   return getComponentUid(currentTarget || target)
 }

package/src/parts/CreateEventListenerFunction/CreateEventListenerFunction.ts

@@ -3,8 +3,8 @@ import * as GetEventListenerArgs from '../GetEventListenerArgs/GetEventListenerA
 import * as IpcState from '../IpcState/IpcState.ts'
 import * as NameAnonymousFunction from '../NameAnonymousFunction/NameAnonymousFunction.ts'
 
-export const createFn = (info) => {
-  const fn = (event) => {
+export const createFn = (info): any => {
+  const fn = (event): void => {
     if (info.preventDefault) {
       event.preventDefault(event)
     }

package/src/parts/ElementTagMap/ElementTagMap.ts

@@ -1,7 +1,7 @@
 import * as ElementTag from '../ElementTags/ElementTags.ts'
 import * as VirtualDomElements from '../VirtualDomElements/VirtualDomElements.ts'
 
-export const getElementTag = (type) => {
+export const getElementTag = (type: number): string => {
   switch (type) {
     case VirtualDomElements.Audio:
       return ElementTag.Audio

package/src/parts/GetEventListenerArg/GetEventListenerArg.ts

@@ -12,6 +12,10 @@ export const getEventListenerArg = (param: string, event: any): any => {
       return event.button
     case 'event.target.value':
       return event.target.value
+    case 'event.isTrusted':
+      return event.isTrusted
+    case 'event.target.className':
+      return event.target.className
     case 'event.data':
       return event.data
     case 'event.deltaMode':
@@ -38,8 +42,6 @@ export const getEventListenerArg = (param: string, event: any): any => {
       return event.shiftKey
     case 'event.inputType':
       return event.inputType
-    case 'event.data':
-      return event.data
     default:
       return param
   }

package/src/parts/GetEventListenerOptions/GetEventListenerOptions.ts

@@ -1,4 +1,4 @@
-export const getEventListenerOptions = (eventName: string, value: any) => {
+export const getEventListenerOptions = (eventName: string, value: any): any => {
   if (value.passive) {
     return {
       passive: true,

package/src/parts/GetUidTarget/GetUidTarget.ts

@@ -1,11 +1,13 @@
 import { uidSymbol } from '../UidSymbol/UidSymbol.ts'
 
-export const getUidTarget = ($Element) => {
+export const getUidTarget = (
+  $Element: HTMLElement,
+): HTMLElement | undefined => {
   while ($Element) {
     if ($Element[uidSymbol]) {
       return $Element
     }
-    $Element = $Element.parentNode
+    $Element = $Element.parentNode as HTMLElement
   }
   return undefined
 }

package/src/parts/GetWrappedListener/GetWrappedListener.ts

@@ -3,12 +3,12 @@ import * as IpcState from '../IpcState/IpcState.ts'
 import * as ListenerCache from '../ListenerCache/ListenerCache.ts'
 import * as NameAnonymousFunction from '../NameAnonymousFunction/NameAnonymousFunction.ts'
 
-export const getWrappedListener = (listener, returnValue) => {
+export const getWrappedListener = (listener, returnValue): any => {
   if (!returnValue) {
     return listener
   }
   if (!ListenerCache.has(listener)) {
-    const wrapped = (event) => {
+    const wrapped = (event): void => {
       const uid = ComponentUid.getComponentUidFromEvent(event)
       const result = listener(event)
       // TODO check for empty array by value

package/src/parts/IpcState/IpcState.ts

@@ -6,6 +6,6 @@ export const getIpc = (): any => {
   return state.ipc
 }
 
-export const setIpc = (value: any) => {
+export const setIpc = (value: any): void => {
   state.ipc = value
 }

package/src/parts/ListenerCache/ListenerCache.ts

@@ -1,13 +1,13 @@
 const cache = new Map()
 
-export const has = (listener) => {
+export const has = (listener): boolean => {
   return cache.has(listener)
 }
 
-export const set = (listener, value) => {
+export const set = (listener, value): void => {
   cache.set(listener, value)
 }
 
-export const get = (listener) => {
+export const get = (listener): any => {
   return cache.get(listener)
 }

package/src/parts/NameAnonymousFunction/NameAnonymousFunction.ts

@@ -1,4 +1,4 @@
-export const nameAnonymousFunction = (fn: any, name: string) => {
+export const nameAnonymousFunction = (fn: any, name: string): void => {
   Object.defineProperty(fn, 'name', {
     value: name,
   })

package/src/parts/QueryInputs/QueryInputs.ts

@@ -0,0 +1,3 @@
+export const queryInputs = ($Viewlet: HTMLElement): readonly any[] => {
+  return [...$Viewlet.querySelectorAll('input, textarea')]
+}

package/src/parts/RegisterEventListeners/RegisterEventListeners.ts

@@ -2,7 +2,7 @@ import * as CreateEventListenerFunction from '../CreateEventListenerFunction/Cre
 
 const listeners = Object.create(null)
 
-export const registerEventListeners = (id, eventListeners) => {
+export const registerEventListeners = (id, eventListeners): void => {
   const map = Object.create(null)
   for (const info of eventListeners) {
     const fn = CreateEventListenerFunction.createFn(info)
@@ -11,7 +11,7 @@ export const registerEventListeners = (id, eventListeners) => {
   listeners[id] = map
 }
 
-export const getEventListenerMap = (id) => {
+export const getEventListenerMap = (id): any => {
   const map = listeners[id]
   return map
 }

package/src/parts/RememberFocus/RememberFocus.ts

@@ -1,30 +1,27 @@
 import * as ComponentUid from '../ComponentUid/ComponentUid.ts'
+import * as QueryInputs from '../QueryInputs/QueryInputs.ts'
 import * as RegisterEventListeners from '../RegisterEventListeners/RegisterEventListeners.ts'
 import * as VirtualDom from '../VirtualDom/VirtualDom.ts'
 
-const queryInputs = ($Viewlet: HTMLElement) => {
-  return [...$Viewlet.querySelectorAll('input, textarea')]
-}
-
 export const rememberFocus = (
   $Viewlet: HTMLElement,
   dom: any[],
   eventMap: any,
   uid = 0,
-) => {
+): any => {
   const oldLeft = $Viewlet.style.left
   const oldTop = $Viewlet.style.top
   const oldWidth = $Viewlet.style.width
   const oldHeight = $Viewlet.style.height
 
-  const {activeElement} = document
+  const { activeElement } = document
   const isTreeFocused = activeElement?.getAttribute('role') === 'tree'
   const isRootTree =
     $Viewlet.getAttribute('role') === 'tree' && activeElement === $Viewlet
 
   const focused = activeElement?.getAttribute('name')
 
-  const $$Inputs = queryInputs($Viewlet)
+  const $$Inputs = QueryInputs.queryInputs($Viewlet)
   const inputMap = Object.create(null)
   for (const $Input of $$Inputs) {
     // @ts-ignore
@@ -43,7 +40,7 @@ export const rememberFocus = (
     VirtualDom.renderInto($Viewlet, dom, eventMap)
   }
 
-  const $$NewInputs = queryInputs($Viewlet)
+  const $$NewInputs = QueryInputs.queryInputs($Viewlet)
   for (const $Input of $$NewInputs) {
     // @ts-ignore
     $Input.value = inputMap[$Input.name] || $Input.value || ''

package/src/parts/RenderInternal/RenderInternal.ts

@@ -5,7 +5,7 @@ export const renderInternal = (
   elements: readonly any[],
   eventMap: any,
   newEventMap?: any,
-) => {
+): void => {
   const max = elements.length - 1
   let stack: Node[] = []
   for (let i = max; i >= 0; i--) {

package/src/parts/VirtualDom/VirtualDom.ts

@@ -1,12 +1,12 @@
 import * as ClearNode from '../ClearNode/ClearNode.ts'
 import * as RenderInternal from '../RenderInternal/RenderInternal.ts'
 
-export const renderInto = ($Parent, dom, eventMap = {}) => {
+export const renderInto = ($Parent, dom, eventMap = {}): void => {
   ClearNode.clearNode($Parent)
   RenderInternal.renderInternal($Parent, dom, eventMap)
 }
 
-export const renderIncremental = ($Parent, dom) => {
+export const renderIncremental = ($Parent, dom): void => {
   if ($Parent.textContent === '') {
     // @ts-expect-error
     renderInternal($Parent, dom)
@@ -16,12 +16,6 @@ export const renderIncremental = ($Parent, dom) => {
   const $Node = $Parent
   for (let i = 0; i < dom.length; i++) {
     const node = dom[i]
-    if (!$Node) {
-      $Parent.append
-    }
-    console.log({ $Node, node })
-    console.log($Node.nodeValue, node.text)
-
     if ($Node.nodeValue !== node.props.text && node.props.text) {
       $Node.nodeValue = node.props.text
     }
@@ -39,7 +33,11 @@ export const renderIncremental = ($Parent, dom) => {
  * @param {any[]} elements
  * @returns
  */
-export const render = (elements, eventMap = {}, newEventMap = {}) => {
+export const render = (
+  elements,
+  eventMap = {},
+  newEventMap = {},
+): HTMLElement => {
   const $Root = document.createElement('div')
   RenderInternal.renderInternal($Root, elements, eventMap, newEventMap)
   return $Root

package/src/parts/VirtualDomElementProp/VirtualDomElementProp.ts

@@ -6,7 +6,7 @@ export const setProp = (
   value: any,
   eventMap: any,
   newEventMap?: any,
-) => {
+): void => {
   switch (key) {
     case 'maskImage':
       $Element.style.maskImage = `url('${value}')`
@@ -44,6 +44,13 @@ export const setProp = (
         $Element.removeAttribute('aria-owns')
       }
       break
+    case 'ariaActivedescendant':
+      if (value) {
+        $Element.setAttribute('aria-activedescendant', value)
+      } else {
+        $Element.removeAttribute('aria-activedescendant')
+      }
+      break
     case 'ariaControls':
       $Element.setAttribute('aria-controls', value)
       break

package/src/parts/VirtualDomElementProps/VirtualDomElementProps.ts

@@ -1,6 +1,6 @@
 import * as VirtualDomElementProp from '../VirtualDomElementProp/VirtualDomElementProp.ts'
 
-export const setProps = ($Element, props, eventMap, newEventMap) => {
+export const setProps = ($Element, props, eventMap, newEventMap): void => {
   for (const key in props) {
     VirtualDomElementProp.setProp(
       $Element,