All columns have options "html" and "width"

underwear · Nov 16, 2020 · 8738432 · 8738432
1 parent 27f5a24
commit 8738432
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 37 deletions.
diff --git a/src/Columns/Column.php b/src/Columns/Column.php
@@ -39,6 +39,16 @@ abstract class Column implements JsonSerializable
      * @var string|null
      */
     protected $type = 'text';
+
+    /**
+     * @var bool
+     */
+    protected $html = false;
+
+    /**
+     * @var string|null
+     */
+    protected $width = null;
 
     /**
      * @var string
@@ -147,6 +157,31 @@ public function getDisplayedValued($row, $attribute = null)
         return $value;
     }
 
+
+     /**
+     * @param bool|null $value
+     *
+     * @return Text
+     */
+    public function html(?bool $value = true): self
+    {
+        $this->html = $value;
+
+        return $this;
+    }
+
+    /**
+     * @param string|null $value
+     *
+     * @return Text
+     */
+    public function width(?string $value): self
+    {
+        $this->width = $value;
+
+        return $this;
+    }
+
     /**
      * Resolve the given attribute from the given resource.
      *
@@ -168,7 +203,9 @@ public function jsonSerialize(): array
         return [
             'label' => $this->getName(),
             'field' => $this->getAttribute(),
-            'type' => $this->getType()
+            'type' => $this->getType(),
+            'html' => $this->html,
+            'width' => $this->width,
         ];
     }
 }
diff --git a/src/Columns/Text.php b/src/Columns/Text.php
@@ -32,16 +32,6 @@ class Text extends Column implements Searchable, Sortable, Filterable
      */
     protected $type = 'text';
 
-    /**
-     * @var bool
-     */
-    protected $html = false;
-
-    /**
-     * @var string|null
-     */
-    protected $width = null;
-
     /**
      * @var null|string
      */
@@ -158,30 +148,6 @@ public function filter($queryBuilder, array $values)
         });
     }
 
-    /**
-     * @param bool|null $value
-     *
-     * @return Text
-     */
-    public function html(?bool $value = true): self
-    {
-        $this->html = $value;
-
-        return $this;
-    }
-
-    /**
-     * @param string|null $value
-     *
-     * @return Text
-     */
-    public function width(?string $value): self
-    {
-        $this->width = $value;
-
-        return $this;
-    }
-
     /**
      * @param Builder $queryBuilder
      * @param string  $searchQuery
@@ -213,9 +179,7 @@ public function jsonSerialize(): array
     {
         return array_merge(parent::jsonSerialize(), [
             'sortable' => $this->isSortable(),
-            'html' => $this->html,
             'filterOptions' => $this->filterOptions ? $this->filterOptions->jsonSerialize() : null,
-            'width' => $this->width
         ]);
     }
 }