fix: boolean props logic

Tencent · Jun 27, 2022 · 6968b8a · 6968b8a
1 parent 9e77540
commit 6968b8a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/dialog/dialog.tsx b/src/dialog/dialog.tsx
@@ -193,7 +193,7 @@ export default defineComponent({
       if (e.code === 'Escape') {
         props.onEscKeydown?.({ e });
         // 根据closeOnEscKeydown判断按下ESC时是否触发close事件
-        if (props.closeOnEscKeydown ?? global.value.closeOnEscKeydown) {
+        if (props.closeOnEscKeydown || global.value.closeOnEscKeydown) {
           emitCloseEvent({
             trigger: 'esc',
             e,
@@ -202,7 +202,7 @@ export default defineComponent({
       }
     };
     const overlayAction = (e: MouseEvent) => {
-      if (props.closeOnOverlayClick ?? global.value.closeOnOverlayClick) {
+      if (props.closeOnOverlayClick || global.value.closeOnOverlayClick) {
         props.onOverlayClick?.({ e });
         emitCloseEvent({
           trigger: 'overlay',

diff --git a/src/drawer/drawer.tsx b/src/drawer/drawer.tsx
@@ -175,13 +175,13 @@ export default defineComponent({
     };
     const handleWrapperClick = (e: MouseEvent) => {
       props.onOverlayClick?.({ e });
-      if (props.closeOnOverlayClick ?? global.value.closeOnOverlayClick) {
+      if (props.closeOnOverlayClick || global.value.closeOnOverlayClick) {
         closeDrawer({ trigger: 'overlay', e });
       }
     };
     const onKeyDown = (e: KeyboardEvent) => {
       // 根据closeOnEscKeydown判断按下ESC时是否触发close事件
-      if ((props.closeOnEscKeydown ?? global.value.closeOnEscKeydown) && e.key === 'Escape') {
+      if ((props.closeOnEscKeydown || global.value.closeOnEscKeydown) && e.key === 'Escape') {
         props.onEscKeydown?.({ e });
         closeDrawer({ trigger: 'esc', e });
       }

diff --git a/src/select/select.tsx b/src/select/select.tsx
@@ -105,7 +105,7 @@ export default defineComponent({
     });
 
     const isFilterable = computed(() => {
-      return Boolean((props.filterable ?? global.value.filterable) || isFunction(props.filter));
+      return Boolean(props.filterable || global.value.filterable || isFunction(props.filter));
     });
 
     // 移除tag