fix: improve setup and error handling

BernhardBaumrock · BernhardBaumrock · commit c6426c6902a4 · 2023-01-08T17:04:24.000+01:00
diff --git a/InputfieldMarkup.php b/InputfieldMarkup.php
@@ -15,6 +15,9 @@ class='rcp-color $selected'
       title='{$col->label}' uk-tooltip
       >$html</div>";
   }
+  if (!$f->colors()->count()) {
+    echo "setup your field in init.php";
+  }
   ?>
   <input type="text" id="<?= $f->id ?>" class="uk-input" name="<?= $f->name ?>" value="<?= $value ?>">
 </div>
diff --git a/InputfieldRockColorPicker.module.php b/InputfieldRockColorPicker.module.php
@@ -27,7 +27,9 @@ public function colors()
   {
     $name = $this->name;
     if ($i = strpos($name, "_repeater")) $name = substr($name, 0, $i);
-    return $this->master()->colors()->get($name);
+    $colors = $this->master()->colors()->get($name);
+    if (!$colors instanceof WireArray) return new WireArray();
+    return $colors;
   }
 
   public function master(): RockColorPicker
@@ -45,7 +47,7 @@ public function ___render()
     if ($val instanceof WireData) $val = $val->name;
     return $this->wire->files->render(
       __DIR__ . "/InputfieldMarkup.php",
-      ['f' => $this, 'value' => $val]
+      ['f' => $this, 'value' => $val ?: false]
     );
   }
 
diff --git a/RockColorPicker.module.php b/RockColorPicker.module.php
@@ -18,7 +18,7 @@ public static function getModuleInfo()
   {
     return [
       'title' => 'RockColorPicker',
-      'version' => '1.2.0',
+      'version' => '1.2.1',
       'summary' => 'Main RockColorPicker Module',
       'autoload' => false,
       'singular' => true, // sic

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,9 @@ public function colors()`
`27`	`27`	`{`
`28`	`28`	`$name = $this->name;`
`29`	`29`	`if ($i = strpos($name, "_repeater")) $name = substr($name, 0, $i);`
`30`		`- return $this->master()->colors()->get($name);`
	`30`	`+ $colors = $this->master()->colors()->get($name);`
	`31`	`+ if (!$colors instanceof WireArray) return new WireArray();`
	`32`	`+ return $colors;`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`public function master(): RockColorPicker`
`@@ -45,7 +47,7 @@ public function ___render()`
`45`	`47`	`if ($val instanceof WireData) $val = $val->name;`
`46`	`48`	`return $this->wire->files->render(`
`47`	`49`	`__DIR__ . "/InputfieldMarkup.php",`
`48`		`- ['f' => $this, 'value' => $val]`
	`50`	`+ ['f' => $this, 'value' => $val ?: false]`
`49`	`51`	`);`
`50`	`52`	`}`
`51`	`53`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static function getModuleInfo()`
`18`	`18`	`{`
`19`	`19`	`return [`
`20`	`20`	`'title' => 'RockColorPicker',`
`21`		`- 'version' => '1.2.0',`
	`21`	`+ 'version' => '1.2.1',`
`22`	`22`	`'summary' => 'Main RockColorPicker Module',`
`23`	`23`	`'autoload' => false,`
`24`	`24`	`'singular' => true, // sic`