From 3b50cc4c6838b2d3e7686f348af902570320bc80 Mon Sep 17 00:00:00 2001
From: 07akioni <07akioni2@gmail.com>
Date: Thu, 9 Sep 2021 00:17:18 +0800
Subject: [PATCH] refactor(cascader): clean code

---
 src/cascader/src/CascaderMenu.tsx | 118 ++++++++++++++----------------
 1 file changed, 56 insertions(+), 62 deletions(-)

diff --git a/src/cascader/src/CascaderMenu.tsx b/src/cascader/src/CascaderMenu.tsx
index f494274d8..0363ee213 100644
--- a/src/cascader/src/CascaderMenu.tsx
+++ b/src/cascader/src/CascaderMenu.tsx
@@ -132,70 +132,64 @@ export default defineComponent({
     return (
       <Transition name="fade-in-scale-up-transition" appear={this.isMounted}>
         {{
-          default: () =>
-            this.show
-              ? withDirectives(
+          default: () => {
+            if (!this.show) return null
+            return withDirectives(
+              <div
+                tabindex="0"
+                ref="selfElRef"
+                class={`${mergedClsPrefix}-cascader-menu`}
+                onMousedown={this.onMousedown}
+                onFocusin={this.handleFocusin}
+                onFocusout={this.handleFocusout}
+                onKeyup={this.onKeyup}
+                style={
+                  {
+                    '--col-count': this.menuModel.length
+                  } as any
+                }
+              >
+                {this.menuModel[0].length ? (
+                  <div class={`${mergedClsPrefix}-cascader-submenu-wrapper`}>
+                    {this.menuModel.map((submenuOptions, index) => (
+                      <NCascaderSubmenu
+                        ref={
+                          ((instance: CascaderSubmenuInstance) => {
+                            if (instance) {
+                              submenuInstRefs[index] = instance
+                            }
+                          }) as any
+                        }
+                        key={index}
+                        tmNodes={submenuOptions}
+                        depth={index + 1}
+                      />
+                    ))}
+                    <NBaseMenuMask
+                      clsPrefix={mergedClsPrefix}
+                      ref="maskInstRef"
+                    />
+                  </div>
+                ) : (
+                  <div class={`${mergedClsPrefix}-cascader-menu__empty`}>
+                    {renderSlot($slots, 'empty', undefined, () => [<NEmpty />])}
+                  </div>
+                )}
+                {$slots.action && (
                   <div
-                    tabindex="0"
-                    ref="selfElRef"
-                    class={`${mergedClsPrefix}-cascader-menu`}
-                    onMousedown={this.onMousedown}
-                    onFocusin={this.handleFocusin}
-                    onFocusout={this.handleFocusout}
-                    onKeyup={this.onKeyup}
-                    style={
-                      {
-                        '--col-count': this.menuModel.length
-                      } as any
-                    }
+                    class={`${mergedClsPrefix}-cascader-menu-action`}
+                    data-action
                   >
-                    {this.menuModel[0].length ? (
-                      <div
-                        class={`${mergedClsPrefix}-cascader-submenu-wrapper`}
-                      >
-                        {this.menuModel.map((submenuOptions, index) => {
-                          return (
-                            <NCascaderSubmenu
-                              ref={
-                                ((instance: CascaderSubmenuInstance) => {
-                                  if (instance) {
-                                    submenuInstRefs[index] = instance
-                                  }
-                                }) as any
-                              }
-                              key={index}
-                              tmNodes={submenuOptions}
-                              depth={index + 1}
-                            />
-                          )
-                        })}
-                        <NBaseMenuMask
-                          clsPrefix={mergedClsPrefix}
-                          ref="maskInstRef"
-                        />
-                      </div>
-                    ) : (
-                      <div class={`${mergedClsPrefix}-cascader-menu__empty`}>
-                        {renderSlot($slots, 'empty', undefined, () => [
-                          <NEmpty />
-                        ])}
-                      </div>
-                    )}
-                    {$slots.action ? (
-                      <div
-                        class={`${mergedClsPrefix}-cascader-menu-action`}
-                        data-action
-                      >
-                        {{
-                          default: $slots.action
-                        }}
-                      </div>
-                    ) : null}
-                    <FocusDetector onFocus={this.onTabout} />
-                  </div>,
-                  [[clickoutside, this.handleClickOutside]]
-              )
-              : null
+                    {{
+                      default: $slots.action
+                    }}
+                  </div>
+                )}
+                <FocusDetector onFocus={this.onTabout} />
+              </div>,
+              [[clickoutside, this.handleClickOutside]]
+            )
+          }
         }}
       </Transition>
     )