fix: allow setData undefined (#74)

wechat-miniprogram · Aug 4, 2023 · 0699e00 · 0699e00
1 parent 76595a3
commit 0699e00
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 17 deletions.
diff --git a/glass-easel/src/component.ts b/glass-easel/src/component.ts
@@ -677,7 +677,7 @@ export class Component<
       const builderContext: BuilderContext<any, any, any> = {
         self: methodCaller,
         data,
-        setData: comp.setData.bind(comp) as (newData: { [x: string]: unknown }) => void,
+        setData: comp.setData.bind(comp) as (newData?: { [x: string]: unknown }) => void,
         implement: <TIn extends { [x: string]: unknown }>(
           traitBehavior: TraitBehavior<TIn, { [x: string]: unknown }>,
           impl: TIn,
@@ -1310,18 +1310,20 @@ export class Component<
    * All data observers will not be triggered immediately before applied.
    * Reads of the data will get the unchanged value before applied.
    */
-  updateData(newData: Partial<SetDataSetter<DataWithPropertyValues<TData, TProperty>>>): void
-  updateData(newData: Record<string, any>): void {
+  updateData(newData?: Partial<SetDataSetter<DataWithPropertyValues<TData, TProperty>>>): void
+  updateData(newData?: Record<string, any>): void {
     const dataProxy = this._$dataGroup
     if (dataProxy === undefined) {
       throw new Error('Cannot update data before component created')
     }
-    const keys = Object.keys(newData)
-    for (let i = 0; i < keys.length; i += 1) {
-      const key = keys[i]!
-      const p = parseSinglePath(key)
-      if (p) {
-        dataProxy.replaceDataOnPath(p, newData[key])
+    if (typeof newData === 'object' && newData !== null) {
+      const keys = Object.keys(newData)
+      for (let i = 0; i < keys.length; i += 1) {
+        const key = keys[i]!
+        const p = parseSinglePath(key)
+        if (p) {
+          dataProxy.replaceDataOnPath(p, newData[key])
+        }
       }
     }
   }
@@ -1333,18 +1335,20 @@ export class Component<
    * When called inside observers, the data update will not be applied to templates.
    * Inside observers, it is recommended to use `updateData` instead.
    */
-  setData(newData: Partial<SetDataSetter<DataWithPropertyValues<TData, TProperty>>>): void
-  setData(newData: Record<string, any>): void {
+  setData(newData?: Partial<SetDataSetter<DataWithPropertyValues<TData, TProperty>>>): void
+  setData(newData?: Record<string, any> | undefined): void {
     const dataProxy = this._$dataGroup
     if (dataProxy === undefined) {
       throw new Error('Cannot update data before component created')
     }
-    const keys = Object.keys(newData)
-    for (let i = 0; i < keys.length; i += 1) {
-      const key = keys[i]!
-      const p = parseSinglePath(key)
-      if (p) {
-        dataProxy.replaceDataOnPath(p, newData[key])
+    if (typeof newData === 'object' && newData !== null) {
+      const keys = Object.keys(newData)
+      for (let i = 0; i < keys.length; i += 1) {
+        const key = keys[i]!
+        const p = parseSinglePath(key)
+        if (p) {
+          dataProxy.replaceDataOnPath(p, newData[key])
+        }
       }
     }
     dataProxy.applyDataUpdates()

diff --git a/glass-easel/tests/core/data_update.test.ts b/glass-easel/tests/core/data_update.test.ts
@@ -617,4 +617,19 @@ describe('partial update', () => {
     const comp = glassEasel.Component.createWithContext('root', compDef, domBackend)
     expect(comp.data).toStrictEqual({ a: 123, b: ['a'] })
   })
+
+  test('should allow set empty data', () => {
+    const compDef = componentSpace
+      .define()
+      .data(() => ({
+        a: 123,
+        b: 'abc',
+      }))
+      .registerComponent()
+    const comp = glassEasel.Component.createWithContext('root', compDef, domBackend)
+    comp.updateData({ a: 456 })
+    expect(comp.data.a).toBe(123)
+    comp.setData(undefined)
+    expect(comp.data.a).toBe(456)
+  })
 })