@draftbit/core 49.4.6 → 49.4.8-21b409.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "49.4.6",
+  "version": "49.4.8-21b409.2+21b4097",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/src/index.d.ts",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "49.2.6",
+    "@draftbit/types": "^49.4.8-21b409.2+21b4097",
     "@expo/vector-icons": "^13.0.0",
     "@gorhom/bottom-sheet": "5.0.0-alpha.7",
     "@material-ui/core": "^4.11.0",
@@ -72,11 +72,11 @@
     "react-native-tab-view": "^3.4.0",
     "react-native-typography": "^1.4.1",
     "react-native-web-swiper": "^2.2.3",
+    "react-native-youtube-iframe": "^2.2.2",
     "react-youtube": "^10.1.0"
   },
   "peerDependencies": {
-    "react-native-avoid-softinput": "^4.0.1",
-    "react-native-youtube-iframe": "^2.2.2"
+    "react-native-avoid-softinput": "^4.0.1"
   },
   "peerDependenciesMeta": {
     "react-native-avoid-softinput": {
@@ -113,5 +113,5 @@
     ],
     "testEnvironment": "node"
   },
-  "gitHead": "54ab870a68793bfb043b045ad6d2d1242b2424a5"
+  "gitHead": "21b4097a2f1aae5a4c609eac00cfe1af2efed8cc"
 }

package/src/components/SimpleStyleScrollables/useSplitContentContainerStyles.js

@@ -19,14 +19,22 @@ export const contentContainerStyleNames = [
 ];
 export default function useSplitContentContainerStyles(originalStyle, measuredWidth, measuredHeight) {
     return useDeepCompareMemo(() => {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const flattenedStyle = StyleSheet.flatten(originalStyle);
         let contentContainerStyle = pick(flattenedStyle, contentContainerStyleNames);
-        // contentContainerStyle should always at least fill the parent to ensure sizing changes reflects properly on component and children
+        const leftBorderWidth = (_b = (_a = flattenedStyle.borderLeftWidth) !== null && _a !== void 0 ? _a : flattenedStyle.borderWidth) !== null && _b !== void 0 ? _b : 0;
+        const rightBorderWidth = (_d = (_c = flattenedStyle.borderRightWidth) !== null && _c !== void 0 ? _c : flattenedStyle.borderWidth) !== null && _d !== void 0 ? _d : 0;
+        const topBorderWidth = (_f = (_e = flattenedStyle.borderTopWidth) !== null && _e !== void 0 ? _e : flattenedStyle.borderWidth) !== null && _f !== void 0 ? _f : 0;
+        const bottomBorderWidth = (_h = (_g = flattenedStyle.borderBottomWidth) !== null && _g !== void 0 ? _g : flattenedStyle.borderWidth) !== null && _h !== void 0 ? _h : 0;
+        // contentContainerStyle should always at least fill the parent to ensure sizing changes reflects properly on component and children.
+        // The measured sizes include borders, so we need to subtract those before applying
         if (measuredWidth) {
-            contentContainerStyle.minWidth = measuredWidth;
+            contentContainerStyle.minWidth =
+                measuredWidth - leftBorderWidth - rightBorderWidth;
         }
         if (measuredHeight) {
-            contentContainerStyle.minHeight = measuredHeight;
+            contentContainerStyle.minHeight =
+                measuredHeight - topBorderWidth - bottomBorderWidth;
         }
         let style = omit(flattenedStyle, contentContainerStyleNames);
         // ScrollView's implementation defaults flexGrow to 1, which prevents the ability to set a static size or use a flex larger than 1

package/src/components/SimpleStyleScrollables/useSplitContentContainerStyles.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSplitContentContainerStyles.js","sourceRoot":"","sources":["useSplitContentContainerStyles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,UAAU,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAOrD,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,SAAS;IACT,eAAe;IACf,YAAY;IACZ,mBAAmB;IACnB,aAAa;IACb,cAAc;IACd,cAAc;IACd,YAAY;IACZ,iBAAiB;IACjB,gBAAgB;IAChB,YAAY;IACZ,cAAc;IACd,eAAe;IACf,UAAU;CACX,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,8BAA8B,CACpD,aAAmC,EACnC,aAAsB,EACtB,cAAuB;IAEvB,OAAO,kBAAkB,CAAS,GAAG,EAAE;QACrC,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAEzD,IAAI,qBAAqB,GAAG,IAAI,CAC9B,cAAc,EACd,0BAA0B,CAC3B,CAAC;QAEF,oIAAoI;QACpI,IAAI,aAAa,EAAE;YACjB,qBAAqB,CAAC,QAAQ,GAAG,aAAa,CAAC;SAChD;QACD,IAAI,cAAc,EAAE;YAClB,qBAAqB,CAAC,SAAS,GAAG,cAAc,CAAC;SAClD;QAED,IAAI,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;QAE7D,kIAAkI;QAClI,4DAA4D;QAC5D,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;YAC5B,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC;SACnC;aAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE;YACvC,KAAK,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,KAAK,EAAE,CAAC;SAC5C;QAED,OAAO,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC;IAC1C,CAAC,EAAE,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;AACrD,CAAC"}
+{"version":3,"file":"useSplitContentContainerStyles.js","sourceRoot":"","sources":["useSplitContentContainerStyles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,UAAU,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAOrD,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,SAAS;IACT,eAAe;IACf,YAAY;IACZ,mBAAmB;IACnB,aAAa;IACb,cAAc;IACd,cAAc;IACd,YAAY;IACZ,iBAAiB;IACjB,gBAAgB;IAChB,YAAY;IACZ,cAAc;IACd,eAAe;IACf,UAAU;CACX,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,8BAA8B,CACpD,aAAmC,EACnC,aAAsB,EACtB,cAAuB;IAEvB,OAAO,kBAAkB,CAAS,GAAG,EAAE;;QACrC,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAEzD,IAAI,qBAAqB,GAAG,IAAI,CAC9B,cAAc,EACd,0BAA0B,CAC3B,CAAC;QAEF,MAAM,eAAe,GACnB,MAAA,MAAA,cAAc,CAAC,eAAe,mCAAI,cAAc,CAAC,WAAW,mCAAI,CAAC,CAAC;QACpE,MAAM,gBAAgB,GACpB,MAAA,MAAA,cAAc,CAAC,gBAAgB,mCAAI,cAAc,CAAC,WAAW,mCAAI,CAAC,CAAC;QACrE,MAAM,cAAc,GAClB,MAAA,MAAA,cAAc,CAAC,cAAc,mCAAI,cAAc,CAAC,WAAW,mCAAI,CAAC,CAAC;QACnE,MAAM,iBAAiB,GACrB,MAAA,MAAA,cAAc,CAAC,iBAAiB,mCAAI,cAAc,CAAC,WAAW,mCAAI,CAAC,CAAC;QAEtE,qIAAqI;QACrI,mFAAmF;QACnF,IAAI,aAAa,EAAE;YACjB,qBAAqB,CAAC,QAAQ;gBAC5B,aAAa,GAAG,eAAe,GAAG,gBAAgB,CAAC;SACtD;QACD,IAAI,cAAc,EAAE;YAClB,qBAAqB,CAAC,SAAS;gBAC7B,cAAc,GAAG,cAAc,GAAG,iBAAiB,CAAC;SACvD;QAED,IAAI,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;QAE7D,kIAAkI;QAClI,4DAA4D;QAC5D,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;YAC5B,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC;SACnC;aAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE;YACvC,KAAK,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,KAAK,EAAE,CAAC;SAC5C;QAED,OAAO,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC;IAC1C,CAAC,EAAE,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;AACrD,CAAC"}

package/src/components/SimpleStyleScrollables/useSplitContentContainerStyles.ts

@@ -37,12 +37,24 @@ export default function useSplitContentContainerStyles(
       contentContainerStyleNames
     );
 
-    // contentContainerStyle should always at least fill the parent to ensure sizing changes reflects properly on component and children
+    const leftBorderWidth =
+      flattenedStyle.borderLeftWidth ?? flattenedStyle.borderWidth ?? 0;
+    const rightBorderWidth =
+      flattenedStyle.borderRightWidth ?? flattenedStyle.borderWidth ?? 0;
+    const topBorderWidth =
+      flattenedStyle.borderTopWidth ?? flattenedStyle.borderWidth ?? 0;
+    const bottomBorderWidth =
+      flattenedStyle.borderBottomWidth ?? flattenedStyle.borderWidth ?? 0;
+
+    // contentContainerStyle should always at least fill the parent to ensure sizing changes reflects properly on component and children.
+    // The measured sizes include borders, so we need to subtract those before applying
     if (measuredWidth) {
-      contentContainerStyle.minWidth = measuredWidth;
+      contentContainerStyle.minWidth =
+        measuredWidth - leftBorderWidth - rightBorderWidth;
     }
     if (measuredHeight) {
-      contentContainerStyle.minHeight = measuredHeight;
+      contentContainerStyle.minHeight =
+        measuredHeight - topBorderWidth - bottomBorderWidth;
     }
 
     let style = omit(flattenedStyle, contentContainerStyleNames);