feat(ui): add cascader component

DevCloudFE · Jan 21, 2022 · 6cad956 · 6cad956
1 parent 91090a4
commit 6cad956
Show file tree

Hide file tree

Showing 61 changed files with 2,887 additions and 583 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,7 +10,5 @@ updates:
     schedule:
       interval: 'weekly'
       day: 'monday'
-    labels:
-      - 'dependencies'
     ignore:
-      - dependency-name: 'typescript'
+      - dependency-name: '@nrwl*'
diff --git a/packages/site/src/app/components/route/RouteArticle.tsx b/packages/site/src/app/components/route/RouteArticle.tsx
@@ -23,7 +23,7 @@ export function AppRouteArticle(props: AppRouteArticleProps) {
   const icon = (top: boolean) => (
     <DIcon
       style={{
-        transform: menuOpen ? (top ? 'translateY(12px)' : 'translateY(-12px)') : undefined,
+        transform: menuOpen ? 'translateY(-12px)' : undefined,
         transition: 'transform 0.2s ease',
       }}
       viewBox="0 0 926.23699 573.74994"

diff --git a/packages/ui/src/components/_dialog/Dialog.tsx b/packages/ui/src/components/_dialog/Dialog.tsx
@@ -61,7 +61,7 @@ export function DDialog(props: DDialogProps) {
           {...restProps}
           ref={dDialogRef}
           className={getClassName(className, `${dPrefix}dialog`)}
-          style={mergeStyle(style, { display: dHidden ? 'none' : undefined })}
+          style={mergeStyle({ display: dHidden ? 'none' : undefined }, style)}
           role="dialog"
           aria-modal="true"
         >

diff --git a/packages/ui/src/components/_popup/Popup.tsx b/packages/ui/src/components/_popup/Popup.tsx
@@ -587,11 +587,14 @@ const Popup: React.ForwardRefRenderFunction<DPopupRef, DPopupProps> = (props, re
             {...restProps}
             ref={popupRef}
             className={getClassName(className, `${dPrefix}popup`, `${dPrefix}popup--` + placement)}
-            style={mergeStyle(style, {
-              ...popupPositionStyle,
-              display: hidden ? 'none' : undefined,
-              zIndex,
-            })}
+            style={mergeStyle(
+              {
+                ...popupPositionStyle,
+                display: hidden ? 'none' : undefined,
+                zIndex,
+              },
+              style
+            )}
             tabIndex={-1}
             onMouseEnter={handleMouseEnter}
             onMouseLeave={handleMouseLeave}