From 81cb0783965a6d2f9f2ce9277331f7c43977f061 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 12 Oct 2021 09:49:09 +0800
Subject: [PATCH] chore: update jsx event binding to ts 4.4 (#9660)

---
 packages/vant/src/action-sheet/ActionSheet.tsx       | 2 +-
 packages/vant/src/address-edit/AddressEditDetail.tsx | 2 +-
 packages/vant/src/calendar/Calendar.tsx              | 2 +-
 packages/vant/src/dialog/Dialog.tsx                  | 2 +-
 packages/vant/src/dialog/function-call.tsx           | 2 +-
 packages/vant/src/image-preview/ImagePreview.tsx     | 2 +-
 packages/vant/src/image-preview/function-call.tsx    | 6 ++----
 packages/vant/src/notify/Notify.tsx                  | 7 ++++++-
 packages/vant/src/notify/function-call.tsx           | 2 +-
 packages/vant/src/popover/Popover.tsx                | 2 +-
 packages/vant/src/search/Search.tsx                  | 2 +-
 packages/vant/src/share-sheet/ShareSheet.tsx         | 2 +-
 packages/vant/src/toast/Toast.tsx                    | 2 +-
 13 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/packages/vant/src/action-sheet/ActionSheet.tsx b/packages/vant/src/action-sheet/ActionSheet.tsx
index d7ff32697..ca3a0faa2 100644
--- a/packages/vant/src/action-sheet/ActionSheet.tsx
+++ b/packages/vant/src/action-sheet/ActionSheet.tsx
@@ -148,8 +148,8 @@ export default defineComponent({
       <Popup
         class={bem()}
         position="bottom"
+        onUpdate:show={updateShow}
         {...pick(props, popupKeys)}
-        {...{ 'onUpdate:show': updateShow }}
       >
         {renderHeader()}
         {renderDescription()}
diff --git a/packages/vant/src/address-edit/AddressEditDetail.tsx b/packages/vant/src/address-edit/AddressEditDetail.tsx
index 0b566c853..3401e5d1b 100644
--- a/packages/vant/src/address-edit/AddressEditDetail.tsx
+++ b/packages/vant/src/address-edit/AddressEditDetail.tsx
@@ -96,7 +96,7 @@ export default defineComponent({
               errorMessage={props.errorMessage}
               onBlur={onBlur}
               onFocus={onFocus}
-              {...{ 'onUpdate:modelValue': onInput }}
+              onUpdate:modelValue={onInput}
             />
             {renderSearchResult()}
           </>
diff --git a/packages/vant/src/calendar/Calendar.tsx b/packages/vant/src/calendar/Calendar.tsx
index 25a24c888..d437fd1cb 100644
--- a/packages/vant/src/calendar/Calendar.tsx
+++ b/packages/vant/src/calendar/Calendar.tsx
@@ -566,7 +566,7 @@ export default defineComponent({
             teleport={props.teleport}
             closeOnPopstate={props.closeOnPopstate}
             closeOnClickOverlay={props.closeOnClickOverlay}
-            {...{ 'onUpdate:show': updateShow }}
+            onUpdate:show={updateShow}
           >
             {renderCalendar()}
           </Popup>
diff --git a/packages/vant/src/dialog/Dialog.tsx b/packages/vant/src/dialog/Dialog.tsx
index 5a1bddd77..74881533f 100644
--- a/packages/vant/src/dialog/Dialog.tsx
+++ b/packages/vant/src/dialog/Dialog.tsx
@@ -228,8 +228,8 @@ export default defineComponent({
           class={[bem([theme]), className]}
           style={{ width: addUnit(width) }}
           aria-labelledby={title || message}
+          onUpdate:show={updateShow}
           {...pick(props, popupKeys)}
-          {...{ 'onUpdate:show': updateShow }}
         >
           {renderTitle()}
           {renderContent()}
diff --git a/packages/vant/src/dialog/function-call.tsx b/packages/vant/src/dialog/function-call.tsx
index 3cadcc158..c1ac612e2 100644
--- a/packages/vant/src/dialog/function-call.tsx
+++ b/packages/vant/src/dialog/function-call.tsx
@@ -10,7 +10,7 @@ function initInstance() {
   const Wrapper = {
     setup() {
       const { state, toggle } = usePopupState();
-      return () => <VanDialog {...state} {...{ 'onUpdate:show': toggle }} />;
+      return () => <VanDialog {...state} onUpdate:show={toggle} />;
     },
   };
 
diff --git a/packages/vant/src/image-preview/ImagePreview.tsx b/packages/vant/src/image-preview/ImagePreview.tsx
index 2bbea286b..45b38ff34 100644
--- a/packages/vant/src/image-preview/ImagePreview.tsx
+++ b/packages/vant/src/image-preview/ImagePreview.tsx
@@ -206,13 +206,13 @@ export default defineComponent({
         class={[bem(), props.className]}
         overlayClass={bem('overlay')}
         onClosed={onClosed}
+        onUpdate:show={updateShow}
         {...pick(props, [
           'show',
           'transition',
           'overlayStyle',
           'closeOnPopstate',
         ])}
-        {...{ 'onUpdate:show': updateShow }}
       >
         {renderClose()}
         {renderImages()}
diff --git a/packages/vant/src/image-preview/function-call.tsx b/packages/vant/src/image-preview/function-call.tsx
index 13c4624df..04ebe8e06 100644
--- a/packages/vant/src/image-preview/function-call.tsx
+++ b/packages/vant/src/image-preview/function-call.tsx
@@ -40,10 +40,8 @@ function initInstance() {
       return () => (
         <VanImagePreview
           {...state}
-          {...{
-            onClosed,
-            'onUpdate:show': toggle,
-          }}
+          onClosed={onClosed}
+          onUpdate:show={toggle}
         />
       );
     },
diff --git a/packages/vant/src/notify/Notify.tsx b/packages/vant/src/notify/Notify.tsx
index e9966d9a3..a8a0aa0e1 100644
--- a/packages/vant/src/notify/Notify.tsx
+++ b/packages/vant/src/notify/Notify.tsx
@@ -24,7 +24,11 @@ export default defineComponent({
     lockScroll: Boolean,
   }),
 
-  setup(props, { slots }) {
+  emits: ['update:show'],
+
+  setup(props, { emit, slots }) {
+    const updateShow = (show: boolean) => emit('update:show', show);
+
     return () => (
       <Popup
         show={props.show}
@@ -37,6 +41,7 @@ export default defineComponent({
         position="top"
         duration={0.2}
         lockScroll={props.lockScroll}
+        onUpdate:show={updateShow}
       >
         {slots.default ? slots.default() : props.message}
       </Popup>
diff --git a/packages/vant/src/notify/function-call.tsx b/packages/vant/src/notify/function-call.tsx
index 4ba5e7371..dd4be4cbc 100644
--- a/packages/vant/src/notify/function-call.tsx
+++ b/packages/vant/src/notify/function-call.tsx
@@ -20,7 +20,7 @@ function initInstance() {
   ({ instance } = mountComponent({
     setup() {
       const { state, toggle } = usePopupState();
-      return () => <VanNotify {...state} {...{ 'onUpdate:show': toggle }} />;
+      return () => <VanNotify {...state} onUpdate:show={toggle} />;
     },
   }));
 }
diff --git a/packages/vant/src/popover/Popover.tsx b/packages/vant/src/popover/Popover.tsx
index e5e5307e4..276acb3ec 100644
--- a/packages/vant/src/popover/Popover.tsx
+++ b/packages/vant/src/popover/Popover.tsx
@@ -223,9 +223,9 @@ export default defineComponent({
           transition="van-popover-zoom"
           lockScroll={false}
           onTouchstart={onTouchstart}
+          onUpdate:show={updateShow}
           {...attrs}
           {...pick(props, popupProps)}
-          {...{ 'onUpdate:show': updateShow }}
         >
           {props.showArrow && <div class={bem('arrow')} />}
           <div role="menu" class={bem('content')}>
diff --git a/packages/vant/src/search/Search.tsx b/packages/vant/src/search/Search.tsx
index 50afa39a3..79b393283 100644
--- a/packages/vant/src/search/Search.tsx
+++ b/packages/vant/src/search/Search.tsx
@@ -105,8 +105,8 @@ export default defineComponent({
           class={bem('field')}
           border={false}
           onKeypress={onKeypress}
+          onUpdate:modelValue={onInput}
           {...fieldAttrs}
-          {...{ 'onUpdate:modelValue': onInput }}
         />
       );
     };
diff --git a/packages/vant/src/share-sheet/ShareSheet.tsx b/packages/vant/src/share-sheet/ShareSheet.tsx
index a0b5026a1..984b0565b 100644
--- a/packages/vant/src/share-sheet/ShareSheet.tsx
+++ b/packages/vant/src/share-sheet/ShareSheet.tsx
@@ -140,8 +140,8 @@ export default defineComponent({
       <Popup
         class={bem()}
         position="bottom"
+        onUpdate:show={updateShow}
         {...pick(props, popupKeys)}
-        {...{ 'onUpdate:show': updateShow }}
       >
         {renderHeader()}
         {renderRows()}
diff --git a/packages/vant/src/toast/Toast.tsx b/packages/vant/src/toast/Toast.tsx
index 4cd15e9b8..988cbbf99 100644
--- a/packages/vant/src/toast/Toast.tsx
+++ b/packages/vant/src/toast/Toast.tsx
@@ -141,7 +141,7 @@ export default defineComponent({
         closeOnClickOverlay={props.closeOnClickOverlay}
         onClick={onClick}
         onClosed={clearTimer}
-        {...{ 'onUpdate:show': updateShow }}
+        onUpdate:show={updateShow}
       >
         {renderIcon()}
         {renderMessage()}