Remove View::content property and View::set() method (#2073)

Author: mvorisek

demos/_includes/Demo.php

@@ -9,6 +9,7 @@
 use Atk4\Ui\Js\JsExpression;
 use Atk4\Ui\Js\JsFunction;
 use Atk4\Ui\View;
+use Atk4\Ui\ViewWithContent;
 
 class Demo extends Columns
 {
@@ -66,7 +67,7 @@ public function setCodeAndCall(\Closure $fx, string $lang = 'php'): void
         $code = $this->extractCodeFromClosure($fx);
 
         $this->highLightCode();
-        View::addTo(View::addTo($this->left, ['element' => 'pre']), ['element' => 'code'])
+        ViewWithContent::addTo(View::addTo($this->left, ['element' => 'pre']), ['element' => 'code'])
             ->addClass('language-' . $lang)
             ->set($code)
             ->js(true)->each(new JsFunction(['i, el'], [new JsExpression('hljs.highlightElement(el)')]));

demos/_unit-test/reload.php

@@ -9,12 +9,12 @@
 use Atk4\Ui\Callback;
 use Atk4\Ui\Js\JsReload;
 use Atk4\Ui\Loader;
-use Atk4\Ui\View;
+use Atk4\Ui\ViewWithContent;
 
 /** @var App $app */
 require_once __DIR__ . '/../init-app.php';
 
-$v = View::addTo($app, ['ui' => 'segment']);
+$v = ViewWithContent::addTo($app, ['ui' => 'segment']);
 $v->set('Test');
 $v->name = 'reload';
 
@@ -25,5 +25,5 @@
 $cb->setUrlTrigger('c_reload');
 
 Loader::addTo($app, ['cb' => $cb])->set(static function (Loader $p) {
-    $v = View::addTo($p, ['ui' => 'segment'])->set('loaded');
+    ViewWithContent::addTo($p, ['ui' => 'segment'])->set('loaded');
 });

demos/_unit-test/remove-observer.php

@@ -11,6 +11,7 @@
 use Atk4\Ui\Js\JsExpression;
 use Atk4\Ui\JsSse;
 use Atk4\Ui\View;
+use Atk4\Ui\ViewWithContent;
 
 /** @var App $app */
 require_once __DIR__ . '/../init-app.php';
@@ -21,7 +22,7 @@
 $logInput = View::addTo($app, ['element' => 'input', 'name' => 'log']);
 $logInput->setStyle('width', '100%');
 
-$setBoxTextAndStyleFx = static function (View $view, string $text) {
+$setBoxTextAndStyleFx = static function (ViewWithContent $view, string $text) {
     $view->set($text);
     $view->setStyle('width', 'fit-content');
     $view->setStyle('padding', '5px');
@@ -30,7 +31,7 @@
 };
 
 $addBoxFx = static function ($owner, string $name) use ($setBoxTextAndStyleFx, $logInput) {
-    $box = View::addTo($owner);
+    $box = ViewWithContent::addTo($owner);
     $setBoxTextAndStyleFx($box, $name . (int) $box->getApp()->tryGetRequestQueryParam('i'));
 
     $box->js(true, new JsExpression(<<<'JS'
@@ -84,7 +85,7 @@
 
 Header::addTo($app, ['API']);
 
-$apiContext = View::addTo($app);
+$apiContext = ViewWithContent::addTo($app);
 $setBoxTextAndStyleFx($apiContext, 'stateContext');
 $apiButton = Button::addTo($app, ['Run slow API']);
 $apiButton->on('click', static function () use ($apiButton) {
@@ -99,7 +100,7 @@
 
 Header::addTo($app, ['SSE']);
 
-$sseContext = View::addTo($app);
+$sseContext = ViewWithContent::addTo($app);
 $sse = JsSse::addTo($app, ['stateContext' => $sseContext]);
 $setBoxTextAndStyleFx($sseContext, 'stateContext');
 $sseButton = Button::addTo($app, ['Run slow SSE']);

demos/_unit-test/scope-builder.php

@@ -9,7 +9,7 @@
 use Atk4\Ui\App;
 use Atk4\Ui\Form;
 use Atk4\Ui\Header;
-use Atk4\Ui\View;
+use Atk4\Ui\ViewWithContent;
 
 /** @var App $app */
 require_once __DIR__ . '/../init-app.php';
@@ -37,7 +37,7 @@
 
 $form->onSubmit(static function (Form $form) use ($model) {
     $message = $form->entity->get('qb')->toWords($model);
-    $view = View::addTo($form)->addClass('atk-scope-builder-response');
+    $view = ViewWithContent::addTo($form)->addClass('atk-scope-builder-response');
     $view->set($message);
 
     return $view;
@@ -137,7 +137,7 @@
     EOF, true), \JSON_UNESCAPED_UNICODE);
 
 Header::addTo($app, ['Input:']);
-View::addTo($app, ['element' => 'p', 'content' => $expectedInput])->addClass('atk-expected-input-result');
+ViewWithContent::addTo($app, ['element' => 'p', 'content' => $expectedInput])->addClass('atk-expected-input-result');
 
 $expectedWord = <<<'EOF'
     Project Budget is greater or equal to '{$budget1000Eur}'
@@ -147,4 +147,4 @@
     EOF;
 
 Header::addTo($app, ['Word:']);
-View::addTo($app, ['element' => 'p', 'content' => $expectedWord])->addClass('atk-expected-word-result');
+ViewWithContent::addTo($app, ['element' => 'p', 'content' => $expectedWord])->addClass('atk-expected-word-result');

demos/_unit-test/sse.php

@@ -8,12 +8,12 @@
 use Atk4\Ui\Js\JsExpression;
 use Atk4\Ui\Js\JsToast;
 use Atk4\Ui\JsSse;
-use Atk4\Ui\View;
+use Atk4\Ui\ViewWithContent;
 
 /** @var App $app */
 require_once __DIR__ . '/../init-app.php';
 
-$v = View::addTo($app)->set('This will trigger a network request for testing SSE...');
+$v = ViewWithContent::addTo($app)->set('This will trigger a network request for testing SSE...');
 
 $sse = JsSse::addTo($app);
 // URL trigger must match phpunit test in SSE provider

demos/_unit-test/virtual-page.php

@@ -8,7 +8,7 @@
 use Atk4\Ui\Button;
 use Atk4\Ui\Form;
 use Atk4\Ui\Js\JsToast;
-use Atk4\Ui\View;
+use Atk4\Ui\ViewWithContent;
 use Atk4\Ui\VirtualPage;
 
 /** @var App $app */
@@ -19,10 +19,10 @@
 $vp->set(static function (VirtualPage $firstPage) {
     $secondVp = VirtualPage::addTo($firstPage);
     $secondVp->set(static function (VirtualPage $secondPage) {
-        View::addTo($secondPage)->set('Second Level Page')->addClass('__atk-behat-test-second');
+        ViewWithContent::addTo($secondPage)->set('Second Level Page')->addClass('__atk-behat-test-second');
         $thirdVp = VirtualPage::addTo($secondPage);
         $thirdVp->set(static function (VirtualPage $thirdPage) {
-            View::addTo($thirdPage)->set('Third Level Page')->addClass('__atk-behat-test-third');
+            ViewWithContent::addTo($thirdPage)->set('Third Level Page')->addClass('__atk-behat-test-third');
             $form = Form::addTo($thirdPage);
             $form->addControl('category', [Form\Control\Lookup::class, 'model' => new Category($thirdPage->getApp()->db)]);
             $form->onSubmit(static function (Form $form) {
@@ -34,7 +34,7 @@
         });
         Button::addTo($secondPage, ['Open Third'])->link($thirdVp->getUrl());
     });
-    View::addTo($firstPage)->set('First Level Page')->addClass('__atk-behat-test-first');
+    ViewWithContent::addTo($firstPage)->set('First Level Page')->addClass('__atk-behat-test-first');
     Button::addTo($firstPage, ['Open Second'])->link($secondVp->getUrl());
 });
 

demos/basic/header.php

@@ -7,6 +7,7 @@
 use Atk4\Ui\App;
 use Atk4\Ui\Header;
 use Atk4\Ui\View;
+use Atk4\Ui\ViewWithContent;
 
 /** @var App $app */
 require_once __DIR__ . '/../init-app.php';
@@ -19,7 +20,7 @@
 Header::addTo($seg, ['H3 Header', 'size' => 3]);
 Header::addTo($seg, ['H4 Header', 'size' => 4]);
 Header::addTo($seg, ['H5 Header', 'size' => 5, 'class.dividing' => true]);
-View::addTo($seg, ['element' => 'p'])->set('This is a following paragraph of text');
+ViewWithContent::addTo($seg, ['element' => 'p'])->set('This is a following paragraph of text');
 
 Header::addTo($seg, ['H1', 'size' => 1, 'subHeader' => 'H1 subheader']);
 Header::addTo($seg, ['H5', 'size' => 5, 'subHeader' => 'H5 subheader']);

demos/basic/menu.php

@@ -10,7 +10,7 @@
 use Atk4\Ui\Header;
 use Atk4\Ui\Js\JsToast;
 use Atk4\Ui\Menu;
-use Atk4\Ui\View;
+use Atk4\Ui\ViewWithContent;
 
 /** @var App $app */
 require_once __DIR__ . '/../init-app.php';
@@ -65,7 +65,7 @@
 $menu = Menu::addTo($app, ['vertical']);
 $i = $menu->addItem();
 Header::addTo($i, ['size' => 4])->set('Promotions');
-View::addTo($i, ['element' => 'p'])->set('Check out our promotions');
+ViewWithContent::addTo($i, ['element' => 'p'])->set('Check out our promotions');
 
 // menu without any item should not show
 Menu::addTo($app);

demos/basic/view.php

@@ -16,6 +16,7 @@
 use Atk4\Ui\Paginator;
 use Atk4\Ui\Table;
 use Atk4\Ui\View;
+use Atk4\Ui\ViewWithContent;
 use Atk4\Ui\VirtualPage;
 
 /** @var App $app */
@@ -24,10 +25,10 @@
 $img = $app->cdn['atk'] . '/logo.png';
 
 Header::addTo($app, ['Default view has no styling']);
-View::addTo($app)->set('just a <div> element');
+ViewWithContent::addTo($app)->set('just a <div> element');
 
 Header::addTo($app, ['View can specify CSS class']);
-View::addTo($app, ['ui' => 'segment', 'class.raised' => true])->set('Segment');
+ViewWithContent::addTo($app, ['ui' => 'segment', 'class.raised' => true])->set('Segment');
 
 Header::addTo($app, ['View can contain stuff']);
 Header::addTo(View::addTo($app, ['ui' => 'segment'])
@@ -59,7 +60,7 @@
 $plane = View::addTo($app, ['template' => $planeTemplate]);
 
 Header::addTo($app, ['Can be rendered into HTML']);
-View::addTo($app, ['ui' => 'segment', 'class.raised' => true, 'element' => 'pre'])->set($plane->renderToHtml());
+ViewWithContent::addTo($app, ['ui' => 'segment', 'class.raised' => true, 'element' => 'pre'])->set($plane->renderToHtml());
 
 Header::addTo($app, ['Has a unique global identifier']);
 Label::addTo($app, ['Plane ID:', 'detail' => $plane->name]);

demos/data-action/jsactionsgrid.php

@@ -11,7 +11,7 @@
 use Atk4\Ui\Header;
 use Atk4\Ui\Icon;
 use Atk4\Ui\UserAction\ExecutorFactory;
-use Atk4\Ui\View;
+use Atk4\Ui\ViewWithContent;
 
 // Demo for Model action in Grid
 
@@ -25,7 +25,7 @@
 
 // creating special menu item for multi_step action
 $multiAction = $country->getUserAction('multi_step');
-$specialItem = Factory::factory([View::class], ['class' => ['item'], 'content' => 'Multi Step']);
+$specialItem = Factory::factory([ViewWithContent::class], ['class' => ['item'], 'content' => 'Multi Step']);
 Icon::addTo($specialItem, ['content' => 'window maximize outline']);
 // register this menu item in factory
 $app->getExecutorFactory()->registerTrigger(ExecutorFactory::TABLE_MENU_ITEM, $specialItem, $multiAction);
@@ -35,18 +35,18 @@
 $grid = Grid::addTo($app, ['menu' => false]);
 $grid->setModel($country);
 
-$divider = Factory::factory([View::class], ['class' => ['divider'], 'content' => '']);
+$divider = Factory::factory([ViewWithContent::class], ['class' => ['divider'], 'content' => '']);
 
-$modelHeader = Factory::factory([View::class], ['class' => ['header'], 'content' => 'Model Actions']);
+$modelHeader = Factory::factory([ViewWithContent::class], ['class' => ['header'], 'content' => 'Model Actions']);
 Icon::addTo($modelHeader, ['content' => 'database']);
 
-$jsHeader = Factory::factory([View::class], ['class' => ['header'], 'content' => 'JS Actions']);
+$jsHeader = Factory::factory([ViewWithContent::class], ['class' => ['header'], 'content' => 'JS Actions']);
 Icon::addTo($jsHeader, ['content' => 'file code']);
 
 $grid->addActionMenuItem($jsHeader);
 // beside model user action, grid menu items can also execute javascript
 $grid->addActionMenuItem('JS Callback', static function () {
-    return (new View())->set('JS Callback done!');
+    return (new ViewWithContent())->set('JS Callback done!');
 }, 'Are you sure?');
 
 $grid->addActionMenuItem($divider);