From 6f00f4940be42a32b40342902a8fadec426ddf0a Mon Sep 17 00:00:00 2001
From: DCloud_LXH <283700113@qq.com>
Date: Tue, 7 Sep 2021 16:34:35 +0800
Subject: [PATCH] fix: useBooleanAttr

---
 packages/uni-components/src/components/checkbox/index.tsx | 3 ++-
 packages/uni-components/src/components/radio/index.tsx    | 2 +-
 packages/uni-components/src/components/switch/index.tsx   | 3 ++-
 packages/uni-h5/src/service/api/ui/popup/showToast.ts     | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/uni-components/src/components/checkbox/index.tsx b/packages/uni-components/src/components/checkbox/index.tsx
index 546bfc825..483363cd1 100644
--- a/packages/uni-components/src/components/checkbox/index.tsx
+++ b/packages/uni-components/src/components/checkbox/index.tsx
@@ -76,13 +76,14 @@ export default /*#__PURE__*/ defineBuiltInComponent({
     useListeners(props, { 'label-click': _onClick })
 
     return () => {
-      const { booleanAttrs } = useBooleanAttr(props, 'disabled')
+      const booleanAttrs = useBooleanAttr(props, 'disabled')
 
       return (
         <uni-checkbox {...booleanAttrs} onClick={_onClick}>
           <div class="uni-checkbox-wrapper">
             <div
               class="uni-checkbox-input"
+              // @ts-ignore
               class={{ 'uni-checkbox-input-disabled': props.disabled }}
             >
               {checkboxChecked.value
diff --git a/packages/uni-components/src/components/radio/index.tsx b/packages/uni-components/src/components/radio/index.tsx
index 3066bde2d..edb71050e 100644
--- a/packages/uni-components/src/components/radio/index.tsx
+++ b/packages/uni-components/src/components/radio/index.tsx
@@ -80,7 +80,7 @@ export default /*#__PURE__*/ defineBuiltInComponent({
     useListeners(props, { 'label-click': _onClick })
 
     return () => {
-      const { booleanAttrs } = useBooleanAttr(props, 'disabled')
+      const booleanAttrs = useBooleanAttr(props, 'disabled')
 
       return (
         <uni-radio {...booleanAttrs} onClick={_onClick}>
diff --git a/packages/uni-components/src/components/switch/index.tsx b/packages/uni-components/src/components/switch/index.tsx
index 53ca85844..654148725 100644
--- a/packages/uni-components/src/components/switch/index.tsx
+++ b/packages/uni-components/src/components/switch/index.tsx
@@ -87,7 +87,7 @@ export default /*#__PURE__*/ defineBuiltInComponent({
 
     return () => {
       const { color, type } = props
-      const { booleanAttrs } = useBooleanAttr(props, 'disabled')
+      const booleanAttrs = useBooleanAttr(props, 'disabled')
 
       return (
         <uni-switch ref={rootRef} {...booleanAttrs} onClick={_onClick}>
@@ -95,6 +95,7 @@ export default /*#__PURE__*/ defineBuiltInComponent({
             <div
               v-show={type === 'switch'}
               class="uni-switch-input"
+              // @ts-ignore
               class={[switchChecked.value ? 'uni-switch-input-checked' : '']}
               style={{
                 backgroundColor: switchChecked.value ? color : '#DFDFDF',
diff --git a/packages/uni-h5/src/service/api/ui/popup/showToast.ts b/packages/uni-h5/src/service/api/ui/popup/showToast.ts
index 45c081d2a..92c1c36b2 100644
--- a/packages/uni-h5/src/service/api/ui/popup/showToast.ts
+++ b/packages/uni-h5/src/service/api/ui/popup/showToast.ts
@@ -1,5 +1,5 @@
 //#region Functions
-import { reactive, nextTick, watch } from 'vue'
+import { reactive, nextTick, watch, watchEffect } from 'vue'
 import { extend } from '@vue/shared'
 import {
   defineAsyncApi,
@@ -27,7 +27,7 @@ import type {
 import { once } from '@dcloudio/uni-shared'
 //#endregion
 
-let showToastState: ToastProps
+export let showToastState: ToastProps
 let showType: 'onShowToast' | 'onShowLoading' | '' = ''
 let timeoutId: number
 const onHidePopupOnce = /*#__PURE__*/ once(() => {
-- 
GitLab