fix(Command): The problem is not repaired Secondary display when only…

… one child
fluent-org · Sep 29, 2019 · ce3d74c · ce3d74c
1 parent d861584
commit ce3d74c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/fluent-ui/src/Command/Command.tsx b/packages/fluent-ui/src/Command/Command.tsx
@@ -42,7 +42,7 @@ const Command: React.FC<CommandProps> = React.forwardRef<HTMLDivElement, Command
     const container: CommandContainer = {
       content: [],
       standard: [],
-      secondary: []
+      secondary: null
     }
     React.Children.forEach(children, (child: CommandChild): void => {
       if (child.type.displayName! === 'FCommandContent') {
@@ -72,6 +72,7 @@ const Command: React.FC<CommandProps> = React.forwardRef<HTMLDivElement, Command
       setSecondaryVisible((visible: boolean): boolean => !visible)
     })
     const otherProps = omit(rest, ['display', 'backgroundColor', 'color'])
+
     return (
       <Box
         ref={ref}
@@ -90,7 +91,7 @@ const Command: React.FC<CommandProps> = React.forwardRef<HTMLDivElement, Command
                 )
               : container.standard}
           </div>
-          {!!container.secondary.length &&
+          {container.secondary !== null &&
             (_reveal ? (
               <RevealWrapper>
                 <Item

diff --git a/packages/fluent-ui/src/Command/Command.type.ts b/packages/fluent-ui/src/Command/Command.type.ts
@@ -17,7 +17,7 @@ export type CommandChild =
 export interface CommandContainer {
   standard: React.ReactComponentElement<typeof Item>[]
   content: React.ReactComponentElement<typeof Content>[]
-  secondary: React.ReactComponentElement<typeof Secondary>[]
+  secondary: React.ReactComponentElement<typeof Secondary>[] | null
 }
 
 export interface CommandProps extends BoxProps {