fix: Update column and row to use fit items

rdkcentral · Sep 28, 2024 · d19951f · d19951f
1 parent b711611
commit d19951f
Show file tree

Hide file tree

Showing 5 changed files with 1,862 additions and 5,302 deletions.
diff --git a/packages/solid/components/Column/Column.styles.ts b/packages/solid/components/Column/Column.styles.ts
@@ -29,7 +29,6 @@ const container: NavigableConfig = {
   },
   base: {
     display: 'flex',
-    flexBoundary: 'fixed',
     flexDirection: 'column',
     gap: theme.layout.gutterY,
     transition: {

diff --git a/packages/solid/components/Row/Row.styles.ts b/packages/solid/components/Row/Row.styles.ts
@@ -29,7 +29,6 @@ const container: NavigableConfig = {
   },
   base: {
     display: 'flex',
-    flexBoundary: 'fixed',
     flexDirection: 'row',
     gap: theme.layout.gutterX,
     transition: {

diff --git a/packages/solid/package.json b/packages/solid/package.json
@@ -57,7 +57,7 @@
     "@solid-primitives/refs": "^1.0.8"
   },
   "peerDependencies": {
-    "@lightningtv/core": "^2.1.6",
+    "@lightningtv/core": "^2.1.8",
     "@lightningtv/solid": "^2.1.2",
     "solid-js": "*"
   },

diff --git a/packages/solid/utils/withScrolling.ts b/packages/solid/utils/withScrolling.ts
@@ -117,14 +117,14 @@ function updateLastIndex(isRow: boolean, items: ElementNode): [{ position: numbe
         position: lastChild.x ?? 0,
         size: lastChild.width ?? 0
       },
-      items.width ?? 0
+      (items.preFlexwidth || items.width) ?? 0
     ];
   }
   return [
     {
       position: lastChild.y ?? 0,
       size: lastChild.height ?? 0
     },
-    items.height ?? 0
+    (items.preFlexheight || items.height) ?? 0
   ];
 }