20 changed files with 114 additions and 645 deletions
--- a/composer.lock
+++ b/composer.lock
@ -1,18 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "76e2cbfc39ced89c5f5aa46d0b1474c7",
-    "packages": [],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "dev",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
-    "plugin-api-version": "2.6.0"
-}
--- a/examples/simple.json
+++ b/examples/simple.json
@ -2,34 +2,21 @@
  "meta": {
    "title": "forma 1",
    "columns": {
-      "id": "ID",
      "email": "Email",
-      "created_at": "Дата создания",
      "description": "Описание 1",
-      "description2": "Описание 2",
-      "status": "Статус"
+      "description2": "Описание 2"
    },
-    "actions": ["view"],
-    "pagination": true,
-    "perPage": "5",
-    "currentPage": "1",
-    "showActionColumn": true,
-    "showFiltersRow": true,
-    "total": 10,
-    "paginationPrefix": "/page",
    "params": {"class":  "table table-bordered", "border": "1"}
  },
-  "filters": ["email", "status"],
  "data": [
-    {"id": 1,"email":"fas1@mail.ru","description":"sdgsdfg","description2":"ffdghdas", "created_at": "17.06.2024", "status":  "1"},
-    {"id": 2,"email":"fas2@mail.ru","description":"fafdgdfgsdfdfs","description2":"ffdghdas", "created_at": "18.06.2024", "status":  "1"},
-    {"id": 3,"email":"fas3@mail.ru","description":"fafdgdssdfgdfs","description2":"ffdghdas", "created_at": "19.06.2024", "status":  2},
-    {"id": 4,"email":"fas4@mail.ru","description":"fafd <b>dsfgsd</b> vcbgdfs","description2":"ffdghdas", "created_at": "20.06.2024", "status":  1},
-    {"id": 5,"email":"fas5@mail.ru","description":"fafdgghjgfdfs","description2":"ffdghdas", "created_at": "21.06.2024", "status":  1},
-    {"id": 6,"email":"fas6@mail.ru","description":"fafddfgdhvgdfs","description2":"ffdghdas", "created_at": "22.06.2024", "status":  1},
-    {"id": 7,"email":"fas7@mail.ru","description":"fafdfgnfdgdfs","description2":"ffdghdas", "created_at": "23.06.2024", "status":  0},
-    {"id": 8,"email":"fas8@mail.ru","description":"fafdfghdfgdfs","description2":"ffdghdas", "created_at": "24.06.2024", "status":  1},
-    {"id": 12,"email":"dfdfd@mail.ru","description":"sdffhdfhggsdfg","description2":"ffdgdfgsdfghdas", "created_at": "25.06.2024", "status":  99},
-    {"id": 13,"email":"dfsdfsddfd@mail.ru","description":"sdffhdfsdfshggsdfg","description2":"ffdgdsdffgsdfghdas", "created_at": "25.06.2024", "status":  1}
+    {"email":"fas1@mail.ru","description":"sdgsdfg","description2":"ffdghdas"},
+    {"email":"fas2@mail.ru","description":"fafdgdfgsdfdfs","description2":"ffdghdas"},
+    {"email":"fas3@mail.ru","description":"fafdgdssdfgdfs","description2":"ffdghdas"},
+    {"email":"fas4@mail.ru","description":"fafddsfgsdvcbgdfs","description2":"ffdghdas"},
+    {"email":"fas5@mail.ru","description":"fafdgghjgfdfs","description2":"ffdghdas"},
+    {"email":"fas6@mail.ru","description":"fafddfgdhvgdfs","description2":"ffdghdas"},
+    {"email":"fas7@mail.ru","description":"fafdfgnfdgdfs","description2":"ffdghdas"},
+    {"email":"fas8@mail.ru","description":"fafdfghdfgdfs","description2":"ffdghdas"},
+    {"email":"dfdfd@mail.ru","description":"sdffhdfhggsdfg","description2":"ffdgdfgsdfghdas"}
  ]
 }
--- a/examples/simple.php
+++ b/examples/simple.php
@ -1,86 +1,16 @@
 <?php

-ini_set("display_errors", true);
-error_reporting(-1);
-
 require_once "../vendor/autoload.php";

-use Itguild\Tables\Filter\InputDateFilter;
-use Itguild\Tables\Filter\InputTextFilter;
-use Itguild\Tables\Filter\SelectFilter;
 use Itguild\Tables\ListJsonTable;

 $json = file_get_contents('simple.json');
 $table = new ListJsonTable($json);
-
-$table->columns([
-    "created_at" => [
-        "format" => "date:Y-m-d",
-        'filter' => [
-            'class' => InputDateFilter::class,
-        ]
-    ],
-    'description' => [
-        "format" => "html",
-        "style" => ["width" => "300px"],
-        "filter" => [
-            'class' => InputTextFilter::class,
-            'value' => 'value'
-        ],
-        "value" => function ($cell) {
-            return "<span style='color: sienna'>$cell</span>";
-        }
-    ],
-    'description2' => [
-        "format" => "html",
-        "filter" => [
-            'class' => SelectFilter::class,
-            'param' => ['black', 'red', 'green', 'blue', 'yellow'],
-            'value' => 'red'
-        ],
-    ],
-    'status' => [
-        "filter" => [
-            'class' => SelectFilter::class,
-            'param' => getStatusLabel(),
-            'value' => 'Активный'
-        ],
-        "value" => function ($cell) {
-            return getStatusLabel()[$cell];
-}],
-    'k33' => [
-        "format" => "integer",
-        'filter' => [
-            'class' => \Itguild\Tables\Filter\InputRangeFilter::class,
-            'param' => ['min' => 0, 'max' => 10],
-        ]
-    ],
-    'email' => function ($cell) {
-        return "<span style='color: aqua'>$cell</span>";
-    },
-]);
+$table->setBeforePrintCell(function ($key, $data) {
+    return $key == "email" ? "<span style='color: aqua'>$data</span>" : $data;
+});
 $table->afterPrint(function ($meta) {
    return "<div>After Print</div>";
 });
-$table->addColumn("Колонка 33", "k33", function ($id) {
-    return "my ID: " . $id;
-});
-$table->addColumn("Колонка 34", "k34", function ($id) {
-    return "some34";
-});
-$table->addAction(function($row, $url){
-    return "<a href='mailto:". $row['email'] ."'>Написать</a>";
-});
 $table->create();
-$table->render();
-
-
-function getStatusLabel(): array
-{
-    return [
-        0 => "На модерации",
-        1 => "Активный",
-        2 => "Модератор",
-        99 => "Удален",
-    ];
-}
+$table->render();
--- a/examples/view.php
+++ b/examples/view.php
@ -7,14 +7,5 @@ use Itguild\Tables\ViewJsonTable;
 $json = file_get_contents('view.json');

 $table = new ViewJsonTable($json);
-//$table->rows([
-$table->rows([
-    'username' => function ($cell) {
-        return "<span style='color: aqua'>$cell</span>";
-    },
-    'email' => function ($cell) {
-        return "<span style='color: firebrick'>$cell</span>";
-    }
-]);
 $table->create();
 $table->render();
--- a/src/Filter/Filter.php
+++ b/src/Filter/Filter.php
@ -1,19 +0,0 @@
-<?php
-
-namespace Itguild\Tables\Filter;
-
-abstract class Filter
-{
-    public string $html = '';
-    public string|array $param;
-    public string $name;
-    public string $value;
-    public function __construct(array $source)
-    {
-        $this->param = $source['param'] ?? '';
-        $this->name = $source['name'];
-        $this->value = $source['value'] ?? '';
-    }
-
-    abstract public function fetch();
-}
--- a/src/Filter/InputDateFilter.php
+++ b/src/Filter/InputDateFilter.php
@ -1,12 +0,0 @@
-<?php
-
-namespace Itguild\Tables\Filter;
-
-class InputDateFilter extends Filter
-{
-
-    public function fetch()
-    {
-        return "<td><input type='date' name='$this->name' value ='$this->value'></td>";
-    }
-}
--- a/src/Filter/InputRangeFilter.php
+++ b/src/Filter/InputRangeFilter.php
@ -1,23 +0,0 @@
-<?php
-
-namespace Itguild\Tables\Filter;
-
-use Itguild\Tables\Filter\Filter;
-
-class InputRangeFilter extends Filter
-{
-    private int $min;
-    private int $max;
-
-    public function __construct(array $source)
-    {
-        parent::__construct($source);
-        $this->min = $this->param['min'] ?? 0;
-        $this->max = $this->param['max'] ?? 100;
-    }
-
-    public function fetch()
-    {
-        return "<td>" . $this->min . " <input type='range' name='$this->name' min= '$this->min' max='$this->max' value ='$this->value'>" . $this->max . "</td>";
-    }
-}
--- a/src/Filter/InputTextFilter.php
+++ b/src/Filter/InputTextFilter.php
@ -1,11 +0,0 @@
-<?php
-
-namespace Itguild\Tables\Filter;
-
-class InputTextFilter extends \Itguild\Tables\Filter\Filter
-{
-    public function fetch()
-    {
-        return "<td><input type='text' name='$this->name' value ='$this->value'></td>";
-    }
-}
--- a/src/Filter/SelectFilter.php
+++ b/src/Filter/SelectFilter.php
@ -1,23 +0,0 @@
-<?php
-
-namespace Itguild\Tables\Filter;
-
-use Itguild\Tables\Filter\Filter;
-
-class SelectFilter extends Filter
-{
-
-    public function fetch()
-    {
-        $this->html = "<td><select name='$this->name'>";
-        foreach ($this->param as $value) {
-            if ($value === $this->value) {
-                $this->html .= "<option value='$value' selected>$value</option>";
-            } else {
-                $this->html .= "<option value='$value'>$value</option>";
-            }
-        }
-        $this->html .= "value='$this->value'</select></td>";
-        return $this->html;
-    }
-}
--- a/src/FormatMapper.php
+++ b/src/FormatMapper.php
@ -1,25 +0,0 @@
-<?php
-
-namespace Itguild\Tables;
-
-use Itguild\Tables\formats\DateFormat;
-use Itguild\Tables\formats\HtmlFormat;
-use Itguild\Tables\formats\IntegerFormat;
-use Itguild\Tables\formats\PhoneNumberFormat;
-use Itguild\Tables\formats\TextFormat;
-
-class FormatMapper
-{
-
-    public static function getFormat(): array
-    {
-        return [
-            'text' => TextFormat::class,
-            'date' => DateFormat::class,
-            'html' => HtmlFormat::class,
-            'phoneNumber' => PhoneNumberFormat::class,
-            'integer' => IntegerFormat::class,
-        ];
-    }
-
-}
--- a/src/JasonTable.php
+++ b/src/JasonTable.php
@ -1,94 +0,0 @@
-<?php
-
-namespace Itguild\Tables;
-
-class JasonTable
-{
-    public string $html = "";
-    protected \Closure|array|false $beforePrintCell;
-    protected \Closure|false $afterPrintHook;
-    protected \Closure|false $beforePrintHook;
-
-
-    public function render(): void
-    {
-        echo $this->html;
-    }
-
-    public function setBeforePrintCell(\Closure $closure): void
-    {
-        $this->beforePrintCell = $closure;
-    }
-
-    public function getCustomCell(string $key, string|null $cell)
-    {
-        if (is_array($this->beforePrintCell)) {
-            if (isset($this->beforePrintCell[$key])) {
-                if (is_array($this->beforePrintCell[$key])){
-                    if (!isset($this->beforePrintCell[$key]['format'])){
-                        $this->beforePrintCell[$key]['format'] = "text";
-                    }
-                    $format = explode(":", $this->beforePrintCell[$key]['format']);
-                    $formatClass = FormatMapper::getFormat()[$format[0]];
-                    $cell = $formatClass::fetch($cell, $format[1] ?? "");
-                    if (isset($this->beforePrintCell[$key]['value'])){
-                        $hook = $this->beforePrintCell[$key]['value'];
-                        $cell = $hook($cell);
-                    }
-                }
-                else {
-                    $hook = $this->beforePrintCell[$key];
-                    $cell = $hook($cell);
-                }
-
-            }
-        } else {
-            $hook = $this->beforePrintCell;
-            $cell = $hook($key, $cell);
-        }
-
-        return $cell;
-    }
-
-    public function afterPrint(\Closure $closure): void
-    {
-        $this->afterPrintHook = $closure;
-    }
-
-    public function beforePrint(\Closure $closure): void
-    {
-        $this->beforePrintHook = $closure;
-    }
-
-    protected function getParamFromCustomColumn(string $column, string $paramName)
-    {
-        if (is_array($this->beforePrintCell)) {
-            if (isset($this->beforePrintCell[$column])) {
-                if (is_array($this->beforePrintCell[$column])){
-                    if (isset($this->beforePrintCell[$column][$paramName])){
-                        return $this->beforePrintCell[$column][$paramName];
-                    }
-                }
-            }
-        }
-
-        return null;
-    }
-
-    protected function getStyleFromCustomColumn(string $column)
-    {
-        $styleStr = '';
-        $style = $this->getParamFromCustomColumn($column, "style");
-        if (is_array($style)){
-            foreach ($style as $key => $value){
-                $styleStr .= $key . ": " . $value . ";";
-            }
-        }
-        else {
-            $styleStr = $style;
-        }
-
-        return $styleStr;
-    }
-
-}
--- a/src/ListJsonTable.php
+++ b/src/ListJsonTable.php
@ -2,43 +2,36 @@

 namespace Itguild\Tables;

-use Exception;
+use Itguild\Tables\ActionColumn\ActionColumn;
 use Itguild\Tables\ActionColumn\DeleteActionColumn;
 use Itguild\Tables\ActionColumn\EditActionColumn;
 use Itguild\Tables\ActionColumn\ViewActionColumn;
-use Itguild\Tables\Filter\InputTextFilter;
 use Itguild\Tables\traits\CreateParams;
 use JetBrains\PhpStorm\NoReturn;

-class ListJsonTable extends JasonTable
+class ListJsonTable
 {
    use CreateParams;

+    private string $html = '';
    private string $json;

    private int $count = 0;
+    private \Closure|false $beforePrintCell;
+    private \Closure|false $beforePrintHook;
+    private \Closure|false $afterPrintHook;
    private string $baseUrl;
    private array $data;

-    private bool $pagination = true;
-    private bool $showActionColumn = true;
-    private bool $showFiltersRow = true;
-    private bool|array $filters = [];
-
    private array $actionsArray = [];
    private array $customActionsArray = [];
-    private array $customColumnsArray = [];

    #[NoReturn] public function __construct(string $json)
    {
-        $this->beforePrintCell = [];
+        $this->beforePrintCell = false;
        $this->json = $json;
        $this->data = json_decode($this->json, true);
        $this->baseUrl = $this->data['meta']['baseUrl'] ?? '';
-        $this->pagination = $this->data['meta']['pagination'] ?? true;
-        $this->showActionColumn = $this->data['meta']['showActionColumn'] ?? true;
-        $this->showFiltersRow = $this->data['meta']['showFiltersRow'] ?? true;
-        $this->filters = $this->data['filters'] ?? [];
        $this->beforePrintHook = function () {
        };
        $this->afterPrintHook = function () {
@ -53,79 +46,69 @@ class ListJsonTable extends JasonTable
        $this->html .= "<table $paramsStr>";
    }

+    public function beforePrint(\Closure $closure): void
+    {
+        $this->beforePrintHook = $closure;
+    }
+
+    public function afterPrint(\Closure $closure): void
+    {
+        $this->afterPrintHook = $closure;
+    }
+
    public function createThead(): void
    {
-        $columnKeys = [];
        if (!isset($this->data['meta']['columns'])) {
            return;
        }

        $this->html .= "<thead><tr>";
-        if (!$this->issetColumn("id")) {
-            $this->html .= "<th>" . "ID" . "</th>";
-            $columnKeys[] = "id";
-        }
-        $columnKeys = array_merge($columnKeys, $this->getColumnKeys());
-        $columnKeys = array_merge($columnKeys, $this->getCustomColumnKeys());
-        $this->getCustomHeadColumn();
-        if ($this->showActionColumn) {
-            $this->html .= "<th>Действия</th></th></tr>";
-        }
-        if ($this->showFiltersRow) {
-            $this->getFilters($columnKeys);
-            $this->html .= "</thead>";
+        $this->html .= "<th>" . "ID" . "</th>";
+        foreach ($this->data['meta']['columns'] as $key => $column) {
+            if ($this->is_fillable($key)) {
+                $this->html .= "<th>" . $column . "</th>";
+            }
        }
+        $this->html .= "<th>Действия</th></th></tr></thead>";
    }

    public function createTbody(): void
    {
        if ($this->data['data']) {
+
            $this->count = $this->data["meta"]["perPage"] * ($this->data['meta']["currentPage"] - 1);
-            foreach ($this->data['data'] as $row) {
-                //сортируем колнки согласно массиву колонок из json
-                $row = array_merge(array_flip($this->getFillableColumns()), $row);
+            foreach ($this->data['data'] as $col) {
                $this->html .= "<tr>";
                $this->count += 1;
-                $id = $row["id"] ?? $this->count;
-                if (!$this->issetColumn("id")) {
-                    $this->html .= '<td><a href=' . $this->baseUrl . "/" . $id . '>' . $id . '</a></td>';
-                }
-                foreach ($row as $key => $cell) {
+                $this->html .= '<td><a href=' . $this->baseUrl . "/" . $col["id"] . '>' . $this->count . '</a></td>';
+                foreach ($col as $key => $row) {
                    if ($this->issetColumn($key) and $this->is_fillable($key)) {
                        if ($this->beforePrintCell) {
-                            if ($key === "id" and $cell === 0) {
-                                $cell = $this->count;
-                            }
-                            $cell = $this->getCustomCell($key, $cell);
+                            $hook = $this->beforePrintCell;
+                            $row = $hook($key, $row);
                        }
-                        $this->html .= "<td style='" . $this->getStyleFromCustomColumn($key) . "'>" . $cell . "</td>";
+
+                        $this->html .= "<td>" . $row . "</td>";
                    }
                }
-                $this->getCustomColumns($row["id"] ?? null);
-                if ($this->showActionColumn) {
-                    if (isset($row["id"])) {
-                        $actions = $this->getActions($row);

-                        $this->html .= "<td>$actions</td></tr>";
-                    } else {
-                        $this->html .= "<td></td></tr>";
-                    }
+                if (isset($col["id"])){
+                    $actions = $this->getActions($col["id"]);
+
+                    $this->html .= "<td>$actions</td></tr>";
+                }
+                else {
+                    $this->html .= "<td></td></tr>";
                }
            }
        }
    }

-    public function addAction(string|\Closure $actionColumn): void
+    public function addAction(string $actionColumn): void
    {
        $this->customActionsArray[] = $actionColumn;
    }

-    public function addColumn(string $label, string $key, \Closure $closure): void
-    {
-        $this->customColumnsArray[] = ['label' => $label, "key" => $key, "handler" => $closure];
-    }
-
-
    private function setActions(): void
    {
        if (isset($this->data['meta']['actions'])) {
@ -146,66 +129,6 @@ class ListJsonTable extends JasonTable
        $this->actionsArray = array_merge($this->actionsArray, $this->customActionsArray);
    }

-    private function getCurrentFilter(string $column)
-    {
-        if (isset($this->beforePrintCell[$column]) and is_array($this->beforePrintCell[$column])) {
-            if (isset($this->beforePrintCell[$column]['filter'])) {
-                if (isset($this->beforePrintCell[$column]['filter']) and is_array($this->beforePrintCell[$column]['filter'])) {
-                    return $this->beforePrintCell[$column]['filter'];
-                }
-            }
-        }
-        return false;
-    }
-
-    public function getCustomColumns($id = null): void
-    {
-        foreach ($this->customColumnsArray as $item) {
-            $this->html .= "<td>" . $item['handler']($id) . "</td>";
-        }
-    }
-
-    public function getCustomHeadColumn(): void
-    {
-        foreach ($this->customColumnsArray as $item) {
-            $this->html .= "<th>" . $item['label'] . "</th>";
-        }
-    }
-
-    protected function getCustomColumnKeys(): array
-    {
-        $keys = [];
-        foreach ($this->customColumnsArray as $item) {
-            $keys[] = $item['key'];
-        }
-
-        return $keys;
-    }
-
-
-    private function getColumnKeys(): array
-    {
-        $columnKeys = [];
-        foreach ($this->data['meta']['columns'] as $key => $column) {
-            if ($this->is_fillable($key)) {
-                $this->html .= "<th>" . $column . "</th>";
-                $columnKeys[] = $key;
-            }
-        }
-        return $columnKeys;
-    }
-
-    private function getFillableColumns(): array
-    {
-        $columnKeys = [];
-        foreach ($this->data['meta']['columns'] as $key => $column) {
-            if ($this->is_fillable($key)) {
-                $columnKeys[] = $key;
-            }
-        }
-        return $columnKeys;
-    }
-
    private function issetColumn($column): bool
    {
        if (isset($this->data['meta']['columns'])) {
@ -219,27 +142,6 @@ class ListJsonTable extends JasonTable
        return false;
    }

-    private function issetFilter(string $filter): bool
-    {
-        if (isset($this->data['filters'])) {
-            foreach ($this->data['filters'] as $currentFilter) {
-                if (is_array($currentFilter)) {
-                    return false;
-                } elseif (is_string($currentFilter)) {
-                    if ($currentFilter === $filter) {
-                        return true;
-                    }
-                }
-            }
-        }
-        if (isset($this->beforePrintCell[$filter]) and is_array($this->beforePrintCell[$filter])) {
-            if (isset($this->beforePrintCell[$filter]['filter'])) {
-                return true;
-            }
-        }
-        return false;
-    }
-
    private function is_fillable($column): bool
    {
        if (isset($this->data['meta']['fillable'])) {
@ -253,52 +155,17 @@ class ListJsonTable extends JasonTable
        return false;
    }

-    private function getActions(array $row): string
+    private function getActions(int $id): string
    {
        $actions = "";
        foreach ($this->actionsArray as $item) {
-            if (is_string($item)) {
-                $objItem = new $item($this->baseUrl, $row['id']);
-                $actions .= $objItem->fetch();
-            } else {
-                $actions .= $item($row, $this->baseUrl);
-            }
+            $objItem = new $item($this->baseUrl, $id);
+            $actions .= $objItem->fetch();
        }

        return $actions;
    }

-    private function getFilters(array $columnKeys): void
-    {
-        $this->html .= "<tr><form action='$this->baseUrl/search'>";
-        foreach ($columnKeys as $key) {
-            if ($this->issetFilter($key)) {
-                $filter = $this->getCurrentFilter($key);
-                $params = [
-                    'param' => $filter['param'] ?? '',
-                    'name' => $key,
-                    'value' => $filter['value'] ?? '',
-                ];
-                if ($filter) {
-                    $class = new $filter['class']($params);
-                    $this->html .= $class->fetch();
-                } else {
-                    $class = new InputTextFilter($params);
-                    $this->html .= $class->fetch();
-                }
-            } else {
-                $this->html .= "<td></td>";
-            }
-        }
-        if ($this->showActionColumn) {
-            $this->html .= "<td></td>";
-        }
-        $this->html .= "</form></tr>";
-    }
-
-    /**
-     * @throws Exception
-     */
    public function create(): void
    {
        $this->setActions();
@ -310,6 +177,7 @@ class ListJsonTable extends JasonTable

    public function tableAction($json): void
    {
+
        $tableJson = json_decode($json, true);

        foreach ($tableJson as $key => $value) {
@ -320,34 +188,20 @@ class ListJsonTable extends JasonTable
        }
    }

-    /**
-     * @throws Exception
-     */
    public function endTable(): void
    {
        $this->html .= "</table>";
        $hookAfter = $this->afterPrintHook;
        $this->html .= $hookAfter($this->data['meta']);
-
-        if ($this->pagination && $this->data['data']) {
-            $options = [
-                'countItem' => $this->data['meta']['total'],
-                'perPage' => $this->data['meta']['perPage'] ?? 10,
-                'currentPage' => $this->data['meta']['currentPage'] ?? 1,
-                'baseUrl' => $this->baseUrl ?? '',
-                'prefix' => $this->data['meta']['paginationPrefix'] ?? '/page',
-            ];
-            $pagination = new Pagination($options);
-            $pagination->create();
-            $this->html .= $pagination->fetch();
-        }
    }

-    public function columns(array $data): void
+    public function render(): void
    {
-        foreach ($data as $key => $value) {
-            $this->beforePrintCell[$key] = $value;
-        }
+        echo $this->html;
    }

+    public function setBeforePrintCell(\Closure $closure): void
+    {
+        $this->beforePrintCell = $closure;
+    }
 }
--- a/src/Pagination.php
+++ b/src/Pagination.php
@ -3,9 +3,6 @@
 namespace Itguild\Tables;


-use Exception;
-use http\Message;
-
 class Pagination
 {

@ -17,24 +14,17 @@ class Pagination

    private string $baseUrl;

-    /**
-     * @throws Exception
-     */
-    public function __construct(array $options)
+    public function __construct($countItem, $perPage, $currentPage, $baseUrl)
    {
-        if (!$options['countItem']) {
-            throw new Exception(message: "countItem is not valid");
-        }
-        $this->countItem = $options['countItem'];
-        $this->perPage = $options['perPage'] ?? 10;
-        $this->currentPage = $options['currentPage'] ?? 1;
-        $this->baseUrl = $options['baseUrl'] ?? '';
-        $this->baseUrl .= $options['prefix'] ?? '/page';
+        $this->countItem = $countItem;
+        $this->perPage = $perPage;
+        $this->currentPage = $currentPage;
+        $this->baseUrl = $baseUrl;

-        $this->countPages = ceil($this->countItem / $this->perPage);
+        $this->countPages = ceil($this->countItem / $perPage);
    }

-    public function create(): void
+    public function create()
    {
        $prev = $this->currentPage - 1 >= 1 ? $this->currentPage - 1 : null;
        $next = $this->currentPage + 1 <= $this->countPages ? $this->currentPage + 1 : null;
@ -52,12 +42,12 @@ class Pagination
        echo $this->html;
    }

-    public function fetch(): string
+    public function fetch()
    {
        return $this->html;
    }

-    private function getTemplate(): string
+    private function getTemplate()
    {
        return '<nav aria-label="Page navigation example">
        <ul class="pagination">
--- a/src/ViewJsonTable.php
+++ b/src/ViewJsonTable.php
@ -4,33 +4,38 @@ namespace Itguild\Tables;

 use Itguild\Tables\traits\CreateParams;

-class ViewJsonTable extends JasonTable
+class ViewJsonTable
 {
    use CreateParams;

    private array $data;
+
+    private string $html = "";
    private string $json;
+
+    private \Closure|false $beforePrintCell;
+    private \Closure|false $beforePrintTable;
+
+    private \Closure|false $afterPrintTable;
+
    private array $dataJson;
    public function __construct($json)
    {
-        $this->beforePrintCell = [];
        $this->json = $json;
        $this->data = json_decode($this->json, true);
        $this->dataJson = $this->data['data'];
-        $this->beforePrintHook = function () {
-        };
-        $this->afterPrintHook = function () {
-        };
    }

+
+
    public function beginTable(): void
    {
        $paramsStr = $this->createParams($this->data['meta']['params']);

        //Хук перед выводом ячейки
-        if (isset($this->beforePrintHook)){
-            $hook = $this->beforePrintHook;
-            $this->html .= $hook();
+        if (isset($this->beforePrintTable)){
+            $hook = $this->beforePrintTable;
+            $this->html = $hook();
        }

        $this->html .= "<table $paramsStr>";
@ -39,14 +44,20 @@ class ViewJsonTable extends JasonTable
    {
        foreach ($this->data['meta']['rows'] as $key => $row){
            if ($this->issetRow($key)){
-                if ($this->beforePrintCell) {
-                    $this->dataJson[$key] = $this->getCustomCell($key, $this->dataJson[$key]);
+                if (isset($this->beforePrintCell)){
+                    $hook = $this->beforePrintCell;
+                    $this->dataJson[$key] = $hook($key, $this->dataJson[$key]);
                }
-                $this->html .= "<tr><th>" . $row . "</th><td>" . $this->dataJson[$key] . "</td></tr>";
+
+                $this->html .= "<tr><th>" . $row . ": </th><td>" . $this->dataJson[$key] . "</td></tr>";
+
            }
        }
+
+
        return $this->html;
    }
+
    private function issetRow($column): bool
    {

@ -65,8 +76,8 @@ class ViewJsonTable extends JasonTable
    {
        $this->html .= "</table>";

-        if(isset($this->afterPrintHook)){
-            $hookAfter = $this->afterPrintHook;
+        if(isset($this->afterPrintTable)){
+            $hookAfter = $this->afterPrintTable;
            $this->html .= $hookAfter();
        }
    }
@ -79,10 +90,23 @@ class ViewJsonTable extends JasonTable
    }


-    public function rows(array $data): void
+    public function beforeTable(\Closure $closure): void
    {
-        foreach ($data as $key => $value) {
-            $this->beforePrintCell[$key] = $value;
-        }
+        $this->beforePrintTable = $closure;
+    }
+
+    public function afterTable(\Closure $closure): void
+    {
+        $this->afterPrintTable = $closure;
+    }
+
+    public function render(): void
+    {
+        echo $this->html;
+    }
+
+    public function setBeforePrintCell(\Closure $closure): void
+    {
+        $this->beforePrintCell = $closure;
    }
 }
--- a/src/formats/BaseFormat.php
+++ b/src/formats/BaseFormat.php
@ -1,10 +0,0 @@
-<?php
-
-namespace Itguild\Tables\formats;
-
-abstract class BaseFormat
-{
-
-    abstract static function fetch(string|null $data, string $options = "");
-
-}
--- a/src/formats/DateFormat.php
+++ b/src/formats/DateFormat.php
@ -1,17 +0,0 @@
-<?php
-
-namespace Itguild\Tables\formats;
-
-use DateTimeImmutable;
-
-class DateFormat extends BaseFormat
-{
-
-    /**
-     * @throws \Exception
-     */
-    static function fetch(?string $data, string $options = ""): ?string
-    {
-        return (new DateTimeImmutable($data ?? ""))->format($options) ?? null;
-    }
-}
--- a/src/formats/HtmlFormat.php
+++ b/src/formats/HtmlFormat.php
@ -1,14 +0,0 @@
-<?php
-
-namespace Itguild\Tables\formats;
-
-use Itguild\Tables\formats\BaseFormat;
-
-class HtmlFormat extends BaseFormat
-{
-
-    static function fetch(?string $data, string $options = ""): string
-    {
-        return (string)$data;
-    }
-}
--- a/src/formats/IntegerFormat.php
+++ b/src/formats/IntegerFormat.php
@ -1,14 +0,0 @@
-<?php
-
-namespace Itguild\Tables\formats;
-
-use Itguild\Tables\formats\BaseFormat;
-
-class IntegerFormat extends BaseFormat
-{
-
-    static function fetch(?string $data, string $options = "")
-    {
-        return intval($data);
-    }
-}
--- a/src/formats/PhoneNumberFormat.php
+++ b/src/formats/PhoneNumberFormat.php
@ -1,14 +0,0 @@
-<?php
-
-namespace Itguild\Tables\formats;
-
-use Itguild\Tables\formats\BaseFormat;
-
-class PhoneNumberFormat extends BaseFormat
-{
-
-    static function fetch(?string $data, string $options = "")
-    {
-        return;
-    }
-}
--- a/src/formats/TextFormat.php
+++ b/src/formats/TextFormat.php
@ -1,13 +0,0 @@
-<?php
-
-namespace Itguild\Tables\formats;
-
-class TextFormat extends BaseFormat
-{
-
-    public static function fetch($data, string $options = ""): string
-    {
-        return strip_tags((string)$data);
-    }
-
-}