Merge pull request #14 from hananils/develop

Version 1.4.0

Author: nilshoerrmann

.eslintrc.json

@@ -0,0 +1,15 @@
+{
+  "env": {
+    "browser": true,
+    "es2021": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:vue/recommended",
+    "prettier"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 12,
+    "sourceType": "module"
+  }
+}

.gitignore

@@ -1,2 +1,2 @@
-/node_modules
-/.cache
+node_modules
+.DS_Store

.prettierrc

@@ -1,10 +1,6 @@
 {
-    "printWidth": 80,
-    "semi": true,
     "singleQuote": true,
     "trailingComma": "none",
-    "bracketSpacing": true,
-    "jsxBracketSameLine": true,
-    "phpVersion": "7.3",
+    "phpVersion": "7.4",
     "trailingCommaPHP": false
 }

composer.json

@@ -18,6 +18,6 @@
         }
     },
     "require": {
-        "getkirby/composer-installer": "^1.1"
+        "getkirby/composer-installer": "^1.2"
     }
 }

composer.lock

@@ -2,25 +2,12 @@
 
 @include_once __DIR__ . '/vendor/autoload.php';
 
-function getValue($value = null)
-{
-    if (is_array($value)) {
-        return $value[0];
-    }
-
-    return $value;
-}
-
 Kirby::plugin('hananils/kirby-colors', [
     'fields' => [
         'colors' => [
             'props' => [
                 'value' => function ($value = null) {
-                    if (is_array($value)) {
-                        return $value[0];
-                    }
-
-                    return $value;
+                    return is_array($value) ? $value[0] : $value;
                 },
                 'help' => function ($help = null) {
                     return $help;
@@ -30,28 +17,28 @@ function getValue($value = null)
                 },
                 'contrast' => function ($contrast = false) {
                     return $contrast;
-                },
+                }
             ],
             'save' => function ($value) {
                 return $value;
-            },
-        ],
+            }
+        ]
     ],
     'fieldMethods' => [
         'isHex' => function ($field) {
             $color = $field->toClass($field);
-            return $color->isHex($value);
+            return $color->toSpace() === 'hex';
         },
         'isRgb' => function ($field) {
             $color = $field->toClass($field);
-            return $color->isRgb($value);
+            return $color->toSpace() === 'rgb';
         },
         'isHsl' => function ($field) {
             $color = $field->toClass($field);
-            return $color->isHsl($value);
+            return $color->toSpace() === 'hsl';
         },
         'toClass' => function ($field) {
-            $value = getValue($field->value);
+            $value = is_array($field->value) ? $field->value[0] : $field->value;
             return new Hananils\Color($value);
         },
         'toColor' => function ($field, $space = null) {
@@ -111,6 +98,6 @@ function getValue($value = null)
             }
 
             return array_shift($readable)['color']->toString($space);
-        },
-    ],
+        }
+    ]
 ]);

index.css

@@ -127,7 +127,7 @@ public function setDefault()
             'h' => 0,
             's' => 0,
             'l' => 100,
-            'a' => 100,
+            'a' => 100
         ]);
     }
 
@@ -292,7 +292,7 @@ public function toValues($precision = 0)
             'h' => round($this->h, $precision),
             's' => round($this->s, $precision),
             'l' => round($this->l, $precision),
-            'a' => round($this->a, $precision),
+            'a' => round($this->a, $precision)
         ];
     }
 
@@ -304,7 +304,7 @@ public function toHex()
             'b' => $this->convertDecimalToHex($this->b),
             'a' => $this->convertDecimalToHex(
                 $this->rebaseDecimalForHex($this->a)
-            ),
+            )
         ];
     }
 
@@ -314,7 +314,7 @@ public function toRgb($precision = 0)
             'r' => round($this->r, $precision),
             'g' => round($this->g, $precision),
             'b' => round($this->b, $precision),
-            'a' => $this->convertToFloat($this->a, $precision),
+            'a' => $this->convertToFloat($this->a, $precision)
         ];
     }
 
@@ -324,7 +324,7 @@ public function toHsl($precision = 0)
             'h' => round($this->h, $precision),
             's' => round($this->s, $precision),
             'l' => round($this->l, $precision),
-            'a' => $this->convertToFloat($this->a, $precision),
+            'a' => $this->convertToFloat($this->a, $precision)
         ];
     }
 

index.js

@@ -32,7 +32,7 @@ public function __construct(
             $this->combinations[] = [
                 'color' => $color,
                 'contrast' => $ratio,
-                'accessibility' => $rating,
+                'accessibility' => $rating
             ];
         }
     }
@@ -118,7 +118,7 @@ public function toReport()
     {
         $report = [
             'color' => $this->color,
-            'combinations' => $this->combinations,
+            'combinations' => $this->combinations
         ];
 
         return $report;