@dcloudio/uni-app-x 0.7.97 → 0.7.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app-x",
-  "version": "0.7.97",
+  "version": "0.7.99",
   "description": "uni-app x types",
   "typings": "index.d.ts",
   "main": "index.d.ts",

package/types/dom2-internal/UniCSSProperty.d.ts

@@ -346,6 +346,10 @@ export enum UniCSSWhiteSpace {
    * 换行符会保留，连续的空白符（空格/制表符）会保留，文本自动换行
    */
   BreakSpaces,
+  /**
+   * 不对text的空白字符做任何处理，直接渲染
+   */
+  Keep,
 }
 
 /**

package/types/dom2-internal/UniPage.d.ts

@@ -20,6 +20,24 @@ declare global {
    */
   interface UniPage {
 
+    /**
+     * 以下属性在DOM层封装
+     * - Android平台：kt层封装
+     * - iOS平台：c层实现
+     * - 鸿蒙平台：c层实现
+     */
+    /**
+     * 获取当前页面是否处于可复用状态，
+     *  仅内部使用（不公开给开发者），用于解决image组件在复用场景时会闪以下复用前的图片
+     *  当页面中的list等复用组件处于复用状态时，将会将此状态设置为true，处于非复用状态时设置为false
+     *  iamge组件在更新src时如果当前页面处于isRecycling状态，需要先同步清空UI显示内容，避免显示复用前的图片
+     */
+    isRecycling(): boolean
+    /**
+     * 设置当前页面是否处于可复用状态
+     */
+    setRecycling(value: boolean): void
+
     /**
      * 创建UniElement
      * 仅内部使用，c层实现，在线程1中创建

package/types/dom2-internal/index.d.ts

@@ -24,7 +24,6 @@ export * from './UniNativeView'
 export * from './UniNativeTextView'
 export * from './UniNativeScrollView'
 export * from './UniNativeRichTextNativelView'
-export * from './UniNativeNestedScrollView'
 export * from './UniNativeImageView'
 export * from './UniNativeDefines'
 export * from './UniNativeCustomView'

package/types/dom2-internal/sharedData.d.ts

@@ -17,94 +17,46 @@ declare global {
     | UniSharedDataFunctionEventListener
     | UniSharedDataFunctionSetTemplateRef
 
-  type UniSharedDataFunctionEventListener = (event: /* UniSharedDataEvent */ UniEvent) => void
-  type UniSharedDataFunctionSetTemplateRef = (el: UniElement) => void
-
-  enum UniSharedDataSchedulerJobType {
-    /**
-     * 各种渲染任务，比如设置属性，样式，更新文字等
-     */
-    RENDER_EFFECT,
-    /**
-     * v-if 任务
-     */
-    V_IF,
-    /**
-     * v-for 任务
-     */
-    V_FOR,
-  }
-
-  type UniSharedDataSchedulerJob = {
-    // 指定线程执行
-    thread?: string
-    type: UniSharedDataSchedulerJobType
-  }
-
-  class UniSharedDataEvent {
-    /**
-     * 事件是否冒泡
-     */
-    bubbles: boolean
-    /**
-     * 事件是否可取消
-     */
-    cancelable: boolean
-    /**
-     * 事件类型
-     */
-    type: string
-    /**
-     * 触发事件的节点ID
-     */
-    target: string
-    /**
-     * 注册事件的节点ID
-     */
-    currentTarget: string
-    /**
-     * 事件创建的时间
-     */
-    timeStamp: number
-  }
+  type UniSharedDataFunctionEventListener = (event : UniEvent) => void
+  type UniSharedDataFunctionSetTemplateRef = (el : UniElement) => void
 
   class UniSharedData {
     /**
      * 所属文件
      * @internal
      */
-    _filename?: string | null
-    /**
-     * 属性变更标识
-     * @internal
-     */
-    _flag0: number
+    _filename ?: string | null
     /**
-     * ArkTS 层数据缓存，主要用于 ArkTS 层判断属性值是否有变化
+     * ArkTS/Kotlin/JavaScript 层数据缓存，主要用于判断属性值是否有变化
      * @internal
      */
-    _cacheProps: Map<string, UniSharedDataAny>
+    _cacheProps : Map<string, UniSharedDataAny>
     /**
      * 所属页面，用于批量执行响应式变更
      * @internal
      */
-    _scope: UniSharedDataPage
+    _scope : UniSharedDataPage
     /**
      * 是否已初始化完成，主要用于二次更新时触发响应式
      * @internal
      */
-    _setReady(): void
+    _setReady() : void
     /**
      * 属性变更时收集 Jobs
      * @internal
      */
-    _queueJobs: (key: string) => void
+    _queueJobs : (key : string) => void
+    /**
+     * 设置 callMethod，用于 script cpp 调用 $callMethod 方法
+     * @internal
+     */
+    _setCallMethod(fn : (...args : any[]) => void) : void
     /**
-     * 设置callMethod
+     * 重置当前数据对象的所有标记位
      * @internal
      */
-    _setCallMethod(fn: (...args: any[]) => void): void
-    constructor(scope: UniSharedDataPage)
+    _resetFlags() : void
+    constructor(scope : UniSharedDataPage)
   }
 
   enum UniSharedDataComponentStyleIsolation {
@@ -125,74 +77,79 @@ declare global {
   }
 
   interface UniSharedDataComponentOptions {
-    vueId: number
-    styleIsolation: UniSharedDataComponentStyleIsolation
-    renderer: UniSharedDataComponentRenderer
-    flatten: UniSharedDataComponentFlatten
+    vueId : number
+    styleIsolation : UniSharedDataComponentStyleIsolation
+    renderer : UniSharedDataComponentRenderer
+    flatten : UniSharedDataComponentFlatten
   }
 
   abstract class UniSharedDataComponent extends UniSharedData {
     /**
      * 组件的类名
      */
-    static className: string
+    static className : string
     /**
      * 当前页面或组件的样式表
      * @internal
      */
-    static _styleSheet: Map<string, Map<string, Map<number, any>>>
+    static styleSheet : Map<string, Map<string, Map<number, any>>>
     /**
      * vue实例ID
      * @internal
      */
-    _vueId: number
+    _vueId : number
     /**
      * 当前页面或组件关联的 UniPage 对象
      * @internal
      */
-    _page: UniPage
+    _page : UniPage
     /**
      * 当前组件所在的上下文，主要用于查找上下文组件的样式表
      * @internal
      */
-    _ctx: UniSharedDataComponent | null
+    _ctx : UniSharedDataComponent | null
     /**
      * 当前组件或页面样式隔离策略
      */
-    _styleIsolation: UniSharedDataComponentStyleIsolation
+    _styleIsolation : UniSharedDataComponentStyleIsolation
     /**
      * 当前组件实例是否拍平
      */
-    _flatten: UniSharedDataComponentFlatten
+    _flatten : UniSharedDataComponentFlatten
     /**
      * 当前组件或页面渲染类型，页面也有可能作为组件来渲染
      */
-    _renderer: UniSharedDataComponentRenderer
+    _renderer : UniSharedDataComponentRenderer
     /**
-     * 自定义组件需要透传的属性，需要暴露给js层设置: _set_inheritAttrs()
+     * 自定义组件需要透传的属性
      * @internal
      */
-    inheritAttrs: UniSharedDataJSONObject
-    constructor(scope: UniSharedDataPage, options: UniSharedDataComponentOptions)
+    _inheritAttrs : UniSharedDataJSONObject
+    constructor(scope : UniSharedDataPage, options : UniSharedDataComponentOptions)
+    /**
+     * 自定义组件需要透传的属性，需要暴露给前端设置: set_inheritAttrs()
+     * @param attrs
+     */
+    set_inheritAttrs(attrs : UniSharedDataJSONObject) : void
     /**
      * 监听组件根节点样式变更
      * @internal
      */
-    useComputedStyle(options: {
-      properties: number[]
-      filterProperties?: boolean | null
-      callback: (result: Array<[string, any | null]>) => void
-    }): Map<string, any | null>
+    useComputedStyle(options : {
+      properties : number[]
+      filterProperties ?: boolean | null
+      callback : (result : Array<[string, any | null]>) => void
+    }) : Map<string, any | null>
     /**
      * 由编译器动态生成的子类中的 Element 渲染器
      * @internal
      */
-    abstract _renderElement(): UniElementBlock
+    abstract _renderElement() : UniElementBlock
     /**
      * 由编译器动态生成的子类中的 NativeView 渲染器
      * @internal
      */
-    abstract _renderNativeView(): UniNativeViewBlock
+    abstract _renderNativeView() : UniNativeViewBlock
   }
 
   abstract class UniSharedDataPage extends UniSharedDataComponent {
@@ -201,18 +158,29 @@ declare global {
      * key 是组件class名称
      * @internal
      */
-    _styleSheetCache: Map<string, Map<string, Map<string, Map<string, unknown>>>>
+    _styleSheetCache : Map<string, Map<string, Map<string, Map<string, unknown>>>>
+    /**
+     * 本次更新收集到的element Jobs，用于批量执行响应式变更(c层)
+     * @internal
+     */
+    _elementJobs : Array<ReactiveEffect<any | null>>
     /**
-     * 本次更新收集到的 Jobs，用于批量执行响应式变更
+     * 本次更新收集到的kotlin element Jobs，用于批量执行响应式变更
      * @internal
      */
-    _jobs: Array<Array<UniSharedDataSchedulerJob[]>>
-    constructor(pageId: number, options: UniSharedDataComponentOptions)
+    _kotlinElementJobs : Array<ReactiveEffect<any | null>>
+    /**
+     * 本次更新收集到的nativeView Jobs，用于批量执行响应式变更
+     * @internal
+     */
+    _nativeViewJobs : Array<ReactiveEffect<any | null>>
+
+    constructor(pageId : number, options : UniSharedDataComponentOptions)
     /**
      * 批量执行响应式变更
      * @internal
      */
-    _flushJobs: () => Promise<void> | void
+    _flushJobs : () => Promise<void> | void
     /**
      * 页面渲染函数
      * 调用页面的 _renderElement 和 _renderNativeView
@@ -220,7 +188,7 @@ declare global {
      * 拿到两个渲染器执行后的 Block 后，插入到页面的根 NativeView 和根 Dom元素中
      * @internal
      */
-    _render: () => Promise<void>
+    _render : () => Promise<void>
   }
 
   abstract class UniSharedDataApp extends UniSharedData {
@@ -228,7 +196,7 @@ declare global {
      * 当前应用全局样式
      * @internal
      */
-    static _styleSheet: Map<string, Map<string, Map<number, any>>>
+    static styleSheet : Map<string, Map<string, Map<number, any>>>
   }
 
   enum UniSharedDataVForDirty {
@@ -247,7 +215,7 @@ declare global {
   }
 
   type UniSharedDataVForMount = {
-    readonly index: number
+    readonly index : number
   }
 
   type UniSharedDataVForUnmount = {
@@ -255,9 +223,9 @@ declare global {
      * 需要移除的索引值
      * 重要：该索引值是oldBlocks中的索引值
      */
-    readonly index: number
-    readonly doRemove: boolean
-    readonly doDeregister: boolean
+    readonly index : number
+    readonly doRemove : boolean
+    readonly doDeregister : boolean
   }
 
   type UniSharedDataVForUpdate = {
@@ -265,43 +233,43 @@ declare global {
      * 需要更新的索引值
      * update((newBlocks[index] = oldBlocks[oldIndex]), getItem(source, i))
      */
-    readonly index: number
+    readonly index : number
     /**
      * 旧索引值
      */
-    readonly oldIndex: number
+    readonly oldIndex : number
   }
 
   class UniSharedDataVFor<T extends UniSharedData> extends UniSharedData {
-    setData(data: T[]): void
-    setMount(mount: UniSharedDataVForMount[]): void
-    setUnmount(unmount: UniSharedDataVForUnmount[]): void
-    setUpdate(update: UniSharedDataVForUpdate[]): void
-    setDirty(dirty: UniSharedDataVForDirty): void
-    create: () => T
-    constructor(scope: UniSharedDataPage)
+    setData(data : T[]) : void
+    setMount(mount : UniSharedDataVForMount[]) : void
+    setUnmount(unmount : UniSharedDataVForUnmount[]) : void
+    setUpdate(update : UniSharedDataVForUpdate[]) : void
+    setDirty(dirty : UniSharedDataVForDirty) : void
+    create : () => T
+    constructor(scope : UniSharedDataPage)
   }
 
-  class VueReactivity {}
+  class VueReactivity { }
 
   // 编译宏
 
-  interface UniSharedDataRegistry {}
+  interface UniSharedDataRegistry { }
 
   type InferSharedData<T, R extends UniSharedData = UniSharedData> = T extends keyof UniSharedDataRegistry ? UniSharedDataRegistry[T] : R
 
-  function useSharedData<T extends string>(scope: UniSharedDataPage): InferSharedData<T>
+  function useSharedData<T extends string>(scope : UniSharedDataPage) : InferSharedData<T>
 
-  function useSharedDataPage<T extends string>(pageIdOrScope: number | UniSharedDataPage, options: UniSharedDataComponentOptions): InferSharedData<T, UniSharedDataPage>
+  function useSharedDataPage<T extends string>(pageIdOrScope : number | UniSharedDataPage, options : UniSharedDataComponentOptions) : InferSharedData<T, UniSharedDataPage>
 
   function useSharedDataComponent<T extends string>(
-    scope: UniSharedDataPage,
-    options: UniSharedDataComponentOptions
-  ): InferSharedData<T, UniSharedDataComponent>
+    scope : UniSharedDataPage,
+    options : UniSharedDataComponentOptions
+  ) : InferSharedData<T, UniSharedDataComponent>
 
-  function useSharedDataVFor<T, S extends UniSharedData>(sharedDataVFor: S): S
+  function useSharedDataVFor<T, S extends UniSharedData>(sharedDataVFor : S) : S
 
-  function useSharedDataRecycleVFor<T, S extends UniSharedData>(sharedDataVFor: S): S
+  function useSharedDataRecycleVFor<T, S extends UniSharedData>(sharedDataVFor : S) : S
 }
 
-export {}
+export { }

package/types/native/CSSStyleDeclaration.d.ts

@@ -17,7 +17,7 @@
  *            "osVer": "5.0.0",
  *            "uniVer": "x",
  *            "unixVer": "4.61",
- *            "unixvVer": "4.61"
+ *            "unixvVer": "5.0"
  *        }
  *    },
  *    "web": {
@@ -85,7 +85,8 @@ export class CSSStyleDeclaration {
    *        "harmony": {
    *            "osVer": "5.0.0",
    *            "uniVer": "x",
-   *            "unixVer": "4.61"
+   *            "unixVer": "4.61",
+   *            "unixVer": "x"
    *        }
    *    },
    *    "mp": {

package/types/native/DrawableContext.d.ts

@@ -86,13 +86,13 @@ declare global {
      *        "ios": {
      *            "osVer": "12.0",
      *            "uniVer": "x",
-     *            "unixVer": "4.11",
-     *            "unixvVer": "x"
+     *            "unixVer": "4.11"
      *        },
      *        "harmony": {
      *            "osVer": "x",
      *            "uniVer": "x",
-     *            "unixVer": "4.61"
+     *            "unixVer": "4.61",
+     *            "unixvVer": "x"
      *        }
      *    },
      *    "mp": {

package/types/native/IUniElement.d.ts

@@ -1992,7 +1992,7 @@ declare global {
      *    }
      * }
      */
-    querySelectorAll(selector: string.cssSelectorString): UniElement[] | null
+    querySelectorAll(selector: string.cssSelectorString): UniElement[]
 
     /**
      * 使元素获取焦点 仅input、Textarea组件支持
@@ -2426,6 +2426,11 @@ declare global {
      */
     testClick(): void
   }
+
+  const UniElement: {
+    prototype: UniElement
+    new(): UniElement
+  }
 }
 
 export type RequestFullscreenOptions = {
@@ -5617,7 +5622,7 @@ declare global {
      *    },
      *    "web": {
      *        "uniVer": "x",
-     *        "unixVer": "4.0"
+     *        "unixVer": "x"
      *    }
      * }
      */
@@ -5689,7 +5694,7 @@ declare global {
      *    },
      *    "web": {
      *        "uniVer": "x",
-     *        "unixVer": "4.0"
+     *        "unixVer": "x"
      *    }
      * }
      */
@@ -7357,10 +7362,6 @@ export interface UniShareElement extends UniElement { }
 
 
 // 允许instanceof检查
-export let UniElement: {
-  prototype: UniElement
-  new(): UniElement
-}
 export let UniButtonElement: {
   prototype: UniButtonElement
   new(): UniButtonElement

package/types/native/IUniNativeViewElement.d.ts

@@ -1,4 +1,4 @@
-import { UniElement } from "./IUniElement"
+import { UniElement } from "./index"
 import { UniCustomEvent } from "./UniCustomEvent"
 /**
  * native-view 元素对象

package/types/native/UniDocument.d.ts

@@ -1,5 +1,6 @@
 import { INodeData } from "./NodeData"
-import { UniElement, UniCommentElement } from "./IUniElement"
+import { UniCommentElement } from "./IUniElement"
+import { UniElement } from './index'
 
 /**
  * @package io.dcloud.uniapp.runtime

package/types/native/UniElement.d.ts

@@ -1,13 +1,13 @@
 import { CSSStyleDeclaration } from "./CSSStyleDeclaration";
 import { DOMRect } from "./DOMRect";
-import { DrawableContext } from "./DrawableContext";
-import { UniElement, UniViewElement, GetBoundingClientRectAsyncOptions, RequestFullscreenOptions } from "./IUniElement";
+import { UniViewElement, GetBoundingClientRectAsyncOptions, RequestFullscreenOptions } from "./IUniElement";
 import { UniEvent } from './UniEvent'
 import { TakeSnapshotOptions } from "./SnapshotOptions";
 import { UniCallbackWrapper } from "./UniCallbackWrapper";
 import { INodeData } from "./NodeData"
 import { PageNode } from "./PageNode"
 import { UniAnimation } from "./UniAnimation";
+import { UniElement, DrawableContext } from './index'
 
 /**
  * view元素对象

package/types/native/UniEvent.d.ts

@@ -1,4 +1,4 @@
-import { UniElement } from "./IUniElement"
+import { UniElement } from "./index"
 
 /**
  * @package io.dcloud.uniapp.runtime

package/types/native/UniPage.d.ts

@@ -1,6 +1,7 @@
 import { UniSafeAreaInsets } from './UniSafeAreaInsets'
-import { FullscreenError, UniElement } from './IUniElement'
+import { FullscreenError } from './IUniElement'
 import { UniPageBody } from './UniPageBody'
+import { UniElement } from './index'
 
 // export type UniPageBody = {
 //   /**
@@ -1109,19 +1110,20 @@ declare global {
     *        "android": {
     *            "osVer": "5.0",
     *            "uniVer": "x",
-    *            "unixVer": "x"
+    *            "unixVer": "5.0"
     *        },
     *        "ios": {
     *            "osVer": "12.0",
     *            "uniVer": "x",
-    *            "unixVer": "x",
+    *            "unixVer": "5.0",
     *            "unixUtsPlugin": "x"
     *        },
     *        "harmony": {
     *            "osVer": "5.0",
     *            "uniVer": "x",
-    *            "unixVer": "x",
-    *            "unixUtsPlugin": "x"
+    *            "unixVer": "5.0",
+    *            "unixUtsPlugin": "x",
+    *            "unixvVer": "5.0"
     *        }
     *    },
     *    "mp": {
@@ -1133,7 +1135,7 @@ declare global {
     *    },
     *    "web": {
     *        "uniVer": "x",
-    *        "unixVer": "x"
+    *        "unixVer": "5.0"
     *    }
     * }
     */
@@ -1146,19 +1148,20 @@ declare global {
     *        "android": {
     *            "osVer": "5.0",
     *            "uniVer": "x",
-    *            "unixVer": "x"
+    *            "unixVer": "5.0"
     *        },
     *        "ios": {
     *            "osVer": "12.0",
     *            "uniVer": "x",
-    *            "unixVer": "x",
+    *            "unixVer": "5.0",
     *            "unixUtsPlugin": "x"
     *        },
     *        "harmony": {
     *            "osVer": "5.0",
     *            "uniVer": "x",
-    *            "unixVer": "x",
-    *            "unixUtsPlugin": "x"
+    *            "unixVer": "5.0",
+    *            "unixUtsPlugin": "x",
+    *            "unixvVer": "5.0"
     *        }
     *    },
     *    "mp": {
@@ -1170,11 +1173,11 @@ declare global {
     *    },
     *    "web": {
     *        "uniVer": "x",
-    *        "unixVer": "x"
+    *        "unixVer": "5.0"
     *    }
     * }
     */
-    querySelectorAll(selector: string.cssSelectorString): UniElement[] | null
+    querySelectorAll(selector: string.cssSelectorString): UniElement[]
   }
 }
 

package/types/native/UniResizeObserver.d.ts

@@ -1,4 +1,4 @@
-import { UniElement } from "./IUniElement";
+import { UniElement } from "./index";
 import { DOMRect } from "./DOMRect";
 
 /**

package/types/native/UniStartNestedScrollEvent.d.ts

@@ -1,5 +1,5 @@
 import { UniEvent } from "./UniEvent";
-import { UniElement } from "./IUniElement";
+import { UniElement } from "./index";
 
 /**
  * @package io.dcloud.uniapp.runtime

package/types/native/UniSwiperAnimationFinishEvent.d.ts

@@ -19,13 +19,27 @@ export class UniSwiperAnimationFinishEventDetail {
    *            "uniVer": "√",
    *            "unixVer": "x"
    *        }
+   *        "harmony": {
+   *          "osVer": "3.0",
+   *          "uniVer": "4.23",
+   *          "unixVer": "4.61",
+   *          "unixvVer": "5.0"
+   *        }
    *    },
    *    "web": {
    *        "osVer": "√",
    *        "uniVer": "√",
-   *        "unixVer": "√",
+   *        "unixVer": "√"
+   *    },
+   *    "mp": {
+   *      "weixin": {
+   *        "hostVer": "1.9.0+",
+   *        "uniVer": "√",
+   *        "unixVer": "4.41"
+   *      }
    *    }
    * }
+   * }
    */
   currentItemId?: string
   /**