@carbon/grid 11.47.0 → 11.48.0-rc.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/grid",
   "description": "Grid for digital and software products using the Carbon Design System",
-  "version": "11.47.0",
+  "version": "11.48.0-rc.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -35,7 +35,7 @@
     "postinstall": "ibmtelemetry --config=telemetry.yml"
   },
   "dependencies": {
-    "@carbon/layout": "^11.45.0",
+    "@carbon/layout": "^11.46.0-rc.0",
     "@ibm/telemetry-js": "^1.5.0"
   },
   "devDependencies": {
@@ -48,5 +48,5 @@
     "sassDir": "scss",
     "needs": "^1.3.0"
   },
-  "gitHead": "57fdbc7bfad9349b5c4359c7d621e709cd4daa25"
+  "gitHead": "8263c72357fc43c00e66c9030698f759ef7977ce"
 }

package/scss/_breakpoint.scss

@@ -152,12 +152,33 @@
 @mixin breakpoint-between($lower, $upper, $breakpoints: $grid-breakpoints) {
   $is-number-lower: meta.type-of($lower) == 'number';
   $is-number-upper: meta.type-of($upper) == 'number';
-  $min: if($is-number-lower, $lower, map.get($breakpoints, $lower));
-  $max: if($is-number-upper, $upper, map.get($breakpoints, $upper));
+  $min: null;
+  $max: null;
+
+  @if $is-number-lower {
+    $min: $lower;
+  } @else {
+    $min: map.get($breakpoints, $lower);
+  }
+
+  @if $is-number-upper {
+    $max: $upper;
+  } @else {
+    $max: map.get($breakpoints, $upper);
+  }
 
   @if $min and $max {
-    $min-width: if(not $is-number-lower and $min, map.get($min, width), $min);
-    $max-width: if(not $is-number-upper and $max, map.get($max, width), $max);
+    $min-width: $min;
+    $max-width: $max;
+
+    @if not $is-number-lower and meta.type-of($min) == 'map' {
+      $min-width: map.get($min, width);
+    }
+
+    @if not $is-number-upper and meta.type-of($max) == 'map' {
+      $max-width: map.get($max, width);
+    }
+
     @media (min-width: $min-width) and (max-width: $max-width) {
       @content;
     }

package/scss/_inlined/_breakpoint.scss

@@ -152,12 +152,33 @@
 @mixin breakpoint-between($lower, $upper, $breakpoints: $grid-breakpoints) {
   $is-number-lower: meta.type-of($lower) == 'number';
   $is-number-upper: meta.type-of($upper) == 'number';
-  $min: if($is-number-lower, $lower, map.get($breakpoints, $lower));
-  $max: if($is-number-upper, $upper, map.get($breakpoints, $upper));
+  $min: null;
+  $max: null;
+
+  @if $is-number-lower {
+    $min: $lower;
+  } @else {
+    $min: map.get($breakpoints, $lower);
+  }
+
+  @if $is-number-upper {
+    $max: $upper;
+  } @else {
+    $max: map.get($breakpoints, $upper);
+  }
 
   @if $min and $max {
-    $min-width: if(not $is-number-lower and $min, map.get($min, width), $min);
-    $max-width: if(not $is-number-upper and $max, map.get($max, width), $max);
+    $min-width: $min;
+    $max-width: $max;
+
+    @if not $is-number-lower and meta.type-of($min) == 'map' {
+      $min-width: map.get($min, width);
+    }
+
+    @if not $is-number-upper and meta.type-of($max) == 'map' {
+      $max-width: map.get($max, width);
+    }
+
     @media (min-width: $min-width) and (max-width: $max-width) {
       @content;
     }