oo-loop 1.0.1 → 1.0.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Loop changelog
 
+## 1.0.2: 2022-04-04
+
+### Fixes
+- Fix `pointbreak()` on rem unit
+- Fix generating double properties when merging custom map with camelCase `props`
+- Fix the lost of references when merging custom config on `init`
+- Bump dependencies
+
 ## 1.0.1 : 2020-07-30
 
 - Add missing `states` properties in variants

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oo-loop",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Loop CSS framework, flexible and expressive CSS",
   "keywords": [
     "scss",
@@ -39,10 +39,10 @@
     "dev": "node-sass -r --output-style expanded --precision 6 src/index.scss dist/loop.css",
     "build": "node-sass --output-style compressed --precision 6 src/index.scss dist/loop.css",
     "watch": "npm run dev && npm run dev -- -w",
-    "example": "node-sass --output-style expanded --source-comments false --precision 6 -w example/ -o example/build"
+    "example": "node-sass --output-style expanded --precision 6 example/src -o example/build"
   },
   "devDependencies": {
-    "node-sass": "^4.13.1"
+    "node-sass": "^7.0.0"
   },
   "engines": {
     "node": ">= 6.0.0",

package/scss/_init.scss

@@ -15,11 +15,11 @@
 /// Init ooLoop configs
 
 @mixin ooInit($custom:null) {
-  $map: if(hasRef($ooLoop), ooParse($ooLoop), $ooLoop);
+  $map: $ooLoop;
   @if isMap($custom) and isNotEmpty($custom) {
     $map: mapMergeDeep($map, $custom);
-    $map: if(hasRef($map), ooParse($map), $map);
   }
+  $map: if(hasRef($map), ooParse($map), $map);
   $map: setMapValue($map, 'init', true);
   $ooLoop: $map !global;
 }

package/scss/functions/_map.scss

@@ -21,11 +21,11 @@
 /// @credit-to  https://gist.github.com/pentzzsolt
 /// @param map $parentMap Map of data to be merged into
 /// @param map $childMap The set of data
-/// @param map $refMap The base map to refer too,
-///   usually equivalent to the $ooLoop before going into nested merge
+/// @param map $refMap The base map to refer too, usually equivalent to the $ooLoop before going into nested merge
+/// @param bool $forceKebab force the use of kebab-case property
 /// @return map
 
-@function mapMergeDeep($parentMap, $childMap, $refMap:null) {
+@function mapMergeDeep($parentMap, $childMap, $refMap:null, $forceKebab: false) {
   $map: $parentMap;
   @if not isMap($map) {
     @return $map;
@@ -34,6 +34,7 @@
   $refMap: if($refMap == null, $ooLoop, $refMap);
 
   @each $key, $value in $childMap {
+    $key: if($forceKebab, toKebabCase($key), $key);
     @if isRef(map-get($map, $key)) {
       $mapValue: getRefValue(map-get($map, $key), $refMap);
       $map: map-merge($map, ($key: $mapValue));
@@ -41,7 +42,7 @@
     @if (not map-has-key($map, $key)) or (type-of(map-get($map, $key) ) != type-of($value)) or (not (isMap(map-get($map, $key)) and isMap($value))) {
       $map: map-merge($map, ($key: $value));
     } @else {
-      $map: map-merge($map, ($key: mapMergeDeep(map-get($map, $key), $value, $refMap)));
+      $map: map-merge($map, ($key: mapMergeDeep(map-get($map, $key), $value, $refMap, inList($key, ('props', 'states')))));
     }
   }
   @return $map;

package/scss/mixins/_breakpoint.scss

@@ -15,7 +15,7 @@
   @if map-has-key(oo('breakpoints'), $key) {
     $minWidth: map-get(oo('breakpoints'), $key);
     $maxWidth: $minWidth - 1;
-    @if unit($minWidth) == 'em' or unit('rem') {
+    @if inList(unit($minWidth), ('em', 'rem')) {
       $maxWidth: $minWidth - 0.001;
     }
     @media (max-width: $maxWidth) {