chenx221/yii2-bootstrap5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

several fixes in popover widget

Browse Source
This commit is contained in:
Simon Karlen 2021-07-13 17:23:28 +02:00
parent 637dd120ab
commit 8a7fffd570
No known key found for this signature in database
GPG Key ID: 0630C27D666EBCC3
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Popover.php
View File

@ -14,7 +14,7 @@ use yii\helpers\ArrayHelper;
* The following example will show the content enclosed between the [[begin()]] * The following example will show the content enclosed between the [[begin()]]
* and [[end()]] calls within the modal window: * and [[end()]] calls within the modal window:
* *
* ~~~php * ```php
* Popover::begin([ * Popover::begin([
* 'title' => 'Hello world', * 'title' => 'Hello world',
* 'toggleButton' => ['label' => 'click me'], * 'toggleButton' => ['label' => 'click me'],
@ -23,7 +23,7 @@ use yii\helpers\ArrayHelper;
* echo 'Say hello...'; * echo 'Say hello...';
* *
* Popover::end(); * Popover::end();
* ~~~ * ```
* *
* @see https://getbootstrap.com/docs/5.0/components/popovers/ * @see https://getbootstrap.com/docs/5.0/components/popovers/
* @author Simon Karlen <simi.albi@outlook.com> * @author Simon Karlen <simi.albi@outlook.com>
@ -100,7 +100,9 @@ class Popover extends Widget
{ {
$content = ob_get_clean(); $content = ob_get_clean();
if (!empty($content)) {
$this->clientOptions['content'] = $content; $this->clientOptions['content'] = $content;
}
$html = $this->renderToggleButton(); $html = $this->renderToggleButton();
$this->registerPlugin('popover'); $this->registerPlugin('popover');
@ -124,14 +126,8 @@ class Popover extends Widget
*/ */
protected function renderHeader(): string protected function renderHeader(): string
{ {
if (isset($this->title)) {
$header = $this->title;
} else {
$header = '';
}
Html::addCssClass($this->headerOptions, ['widget' => 'popover-header']); Html::addCssClass($this->headerOptions, ['widget' => 'popover-header']);
return Html::tag('h3', "\n" . $header . "\n", $this->headerOptions); return Html::tag('h3', '', $this->headerOptions);
} }
/** /**
@ -141,7 +137,7 @@ class Popover extends Widget
protected function renderBody(): string protected function renderBody(): string
{ {
Html::addCssClass($this->bodyOptions, ['widget' => 'popover-body']); Html::addCssClass($this->bodyOptions, ['widget' => 'popover-body']);
return Html::tag('div', $this->bodyOptions); return Html::tag('div', '', $this->bodyOptions);
} }
/** /**
@ -172,10 +168,11 @@ class Popover extends Widget
'role' => 'tooltip', 'role' => 'tooltip',
], $this->options, ['id' => $this->options['id'] . '-popover']); ], $this->options, ['id' => $this->options['id'] . '-popover']);
Html::addCssClass($options, ['widget' => 'popover']); Html::addCssClass($options, ['widget' => 'popover']);
$template = Html::tag('div', $options); $template = Html::beginTag('div', $options);
$template .= $this->renderArrow(); $template .= $this->renderArrow();
$template .= $this->renderHeader(); $template .= $this->renderHeader();
$template .= $this->renderBody(); $template .= $this->renderBody();
$template .= Html::endTag('div');
$this->clientOptions = array_merge([ $this->clientOptions = array_merge([
'template' => $template, 'template' => $template,
@ -187,7 +184,6 @@ class Popover extends Widget
if ($this->toggleButton !== false) { if ($this->toggleButton !== false) {
$this->toggleButton = array_merge([ $this->toggleButton = array_merge([
'data-bs-toggle' => 'popover',
'type' => 'button', 'type' => 'button',
], $this->toggleButton); ], $this->toggleButton);
} }