feat: support all margins

oclif · Sep 9, 2024 · 2b5d84a · 2b5d84a
1 parent a2a1c81
commit 2b5d84a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/table.tsx b/src/table.tsx
@@ -314,7 +314,7 @@ export function makeTable<T extends ScalarDict>(options: TableProps<T>): void {
 
 function Container(props: ContainerProps) {
   return (
-    <Box columnGap={props.columnGap} alignItems={props.alignItems} rowGap={props.rowGap} margin={props.margin} flexWrap="wrap" flexDirection={props.direction ?? 'row'}>
+    <Box flexWrap="wrap" flexDirection={props.direction ?? 'row'} {...props}>
       {props.children}
     </Box>
   )
@@ -324,7 +324,9 @@ export function makeTables<T extends ScalarDict[]>(
   tables: {[P in keyof T]: TableProps<T[P]>},
   options?: Omit<ContainerProps, 'children'>
 ): void {
-  const columns = process.stdout.columns - ((options?.margin ?? 0) * 2)
+  const leftMargin = options?.marginLeft ?? options?.margin ?? 0
+  const rightMargin = options?.marginRight ?? options?.margin ?? 0
+  const columns = process.stdout.columns - (leftMargin + rightMargin)
 
   const processed = tables.map((table) => ({
     ...table,

diff --git a/src/types.ts b/src/types.ts
@@ -232,5 +232,9 @@ export type ContainerProps = {
   readonly columnGap?: number
   readonly direction?: 'row' | 'column'
   readonly margin?: number
+  readonly marginLeft?: number
+  readonly marginRight?: number
+  readonly marginTop?: number
+  readonly marginBottom?: number
   readonly rowGap?: number
 }