Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve arguments appearance + Fix bug #120

Merged
merged 2 commits into from
Jul 2, 2024
Merged

Improve arguments appearance + Fix bug #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1417f87
fix bug
vjik Jul 2, 2024
948fc60
Improve arguments appearance
vjik Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## 3.2.2 under development

- Enh #117: Show arguments table by click (@xepozz)
- Enh #117, #120: Show arguments table by click (@xepozz, @vjik)
- Enh #116: Remove @anonymous postfix (@xepozz)
- Bug #114: Stop `click` event on text selection (@xepozz)
- Enh #114: Show full argument by click (@xepozz)
Expand Down
2 changes: 1 addition & 1 deletion src/Renderer/HtmlRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ public function renderCallStack(Throwable $t, array $trace = []): string
$function = null;
if (!empty($trace[$i]['function']) && $trace[$i]['function'] !== 'unknown') {
$function = $trace[$i]['function'];
if ($class !== null) {
if ($class !== null && !str_contains($function, '{closure}')) {
$parameters = (new \ReflectionMethod($class, $function))->getParameters();
}
}
Expand Down
75 changes: 38 additions & 37 deletions templates/_call-stack-item.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@
use Yiisoft\ErrorHandler\Renderer\HtmlRenderer;

/**
* @var $file string|null
* @var $line int|null
* @var $class string|null
* @var $function string|null
* @var $index int
* @var $lines string[]
* @var $begin int
* @var $end int
* @var $args array
* @var $isVendorFile bool
* @var $reflectionParameters ReflectionMethod[]
* @var $this HtmlRenderer
* @var string|null $file
* @var int|null $line
* @var string|null $class
* @var string|null $function
* @var int $index
* @var string[] $lines
* @var int $begin
* @var int $end
* @var array $args
* @var bool $isVendorFile
* @var ReflectionMethod[] $reflectionParameters
* @var HtmlRenderer $this
*/


$icon = <<<HTML
<svg class="external-link" width="20" height="20" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<title>Open the target page</title>
Expand Down Expand Up @@ -59,34 +58,36 @@
<div class="flex flex-column">
<?= sprintf('at line %d', $line + 1) ?>
<?php if (!empty($args)): ?>
<button class="show-arguments-toggle">arguments</button>
<button class="button toggleFunctionArguments">arguments</button>
<?php endif ?>
</div>
<?php endif ?>
</div>
<div class="function-arguments-wrap hidden">
<?php
if ($function !== null) {
echo '<table class="table w-100">';
foreach ($args as $key => $argument) {
echo '<tr class="argument">';
$key = is_int($key) && isset($reflectionParameters[$key]) ? $reflectionParameters[$key]->getName() : $key;
echo '<td>';
echo '<span class="argument-key bold">$' . $this->htmlEncode($key) . '</span>';
echo '</td>';
echo '<td>';
echo '<span class="argument-value word-break">';
echo $this->argumentsToString(is_array($argument) ? $argument : [$argument]);
echo '</span>';
echo '<span class="argument-type">';
echo gettype($argument);
echo '</span>';
echo '</td>';
echo '</tr>';
}
echo '</table>';
}
?>
<div class="functionArguments hidden">
<?php if ($function !== null) { ?>
<div class="functionArguments_title">
<?= $this->htmlEncode($function) ?> arguments:
</div>
<table>
<?php foreach ($args as $key => $argument) { ?>
<tr>
<td class="functionArguments_key">
$<?= $this->htmlEncode(
is_int($key) && isset($reflectionParameters[$key])
? $reflectionParameters[$key]->getName()
: $key
) ?>
</td>
<td class="functionArguments_type">
<?= gettype($argument) ?>
</td>
<td class="functionArguments_value word-break">
<?= $this->argumentsToString(is_array($argument) ? $argument : [$argument]) ?>
</td>
</tr>
<?php } ?>
</table>
<?php } ?>
</div>
<?php if (!empty($lines)): ?>
<div class="element-code-wrap">
Expand Down
90 changes: 60 additions & 30 deletions templates/development.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,22 @@ ul {
}
/* end reset */


/* light theme */
:root {
--page-bg-color: #fff;
--page-text-color: #505050;
--page-text-muted-color: #888;
--icon-color: #505050;
--icon-hover-color: #000;
--table-line-even-bg: #fff;
--table-line-even-color: #141414;
--table-line-odd-bg: #eee;
--table-line-odd-color: #141414;
--table-line-hover: #ccc;
--button-bg: #eee;
--button-color: #000;
--button-bg-hover: #d4d4d4;
--button-bg: #e3e5e7;
--button-color: #333;
--button-bg-hover: #c4c7cb;
--button-color-hover: #333;
}

Expand Down Expand Up @@ -77,35 +79,65 @@ ul {
background-color: var(--table-line-hover);
}

.argument-type {
padding-left: 4px;
opacity: 0.5;
user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
display: none;
}

.argument:hover .argument-type {
display: inline;
}

button.show-arguments-toggle {
padding: 4px;
.button {
padding: 4px 8px;
font-size: 14px;
box-sizing: border-box;
border: 1px solid #ddd;
border: 0;
background: var(--button-bg);
color: var(--button-color)
color: var(--button-color);
border-radius: 6px;
cursor: pointer;
}

button.show-arguments-toggle:hover {
border-color: var(--button-bg-hover);
.button:hover {
background: var(--button-bg-hover);
color: var(--button-color-hover);
}

.functionArguments {
padding: 20px 0;
border-top: 1px solid var(--element-wrap-border-color);
--function-arguments-bg: #f8f8f8;
--function-arguments-border-color: #e3e3e3;
}
.dark-theme .functionArguments {
--function-arguments-bg: #303030;
--function-arguments-border-color: #272727;
}
.functionArguments_title {
padding: 0 30px 12px;
color: var(--page-text-muted-color);
}
.functionArguments table {
padding: 4px 0;
width: 100%;
background: var(--function-arguments-bg);
border-collapse: collapse;
}
.functionArguments td {
padding: 12px 8px;
border-top: 1px solid var(--function-arguments-border-color);
}
.functionArguments tr:first-child td {
border-top: 0;
}
.functionArguments_key {
padding-left: 30px !important;
white-space: nowrap;
}
.functionArguments_type {
color: var(--page-text-muted-color);
white-space: nowrap;
}
.functionArguments_value {
width: 100%;
padding-right: 30px !important;
}
.toggleFunctionArguments {
margin-top: 4px;
}

header {
--header-bg-color: #ededed;
--previous-text-color: inherit;
Expand Down Expand Up @@ -554,10 +586,6 @@ main {
line-break: normal;
}

.call-stack ul li.application .element-wrap {
border-bottom: 1px solid var(--element-wrap-border-color);
}

.call-stack ul li a {
color: var(--link-color);
}
Expand All @@ -579,6 +607,7 @@ main {
}

.call-stack ul li .element-code-wrap {
border-top: 1px solid var(--element-wrap-border-color);
overflow-x: auto;
}

Expand Down Expand Up @@ -766,6 +795,7 @@ main {
.dark-theme {
--page-bg-color: rgba(46, 46, 46, 0.9);
--page-text-color: #fff;
--page-text-muted-color: #aaa;
--icon-color: #989898;
--icon-hover-color: #fff;

Expand All @@ -775,10 +805,10 @@ main {
--table-line-odd-color: #eee;
--table-line-hover: #141414;

--button-bg: #666;
--button-bg: #6c757d;
--button-color: #fff;
--button-bg-hover: #aaa;
--button-color-hover: #333;
--button-bg-hover: #5c636a;
--button-color-hover: #fff;
}

.dark-theme header {
Expand Down
12 changes: 2 additions & 10 deletions templates/development.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,9 @@ class="copy-clipboard"
refreshCallStackItemCode(stackItem);

// toggle code block visibility
stackItem.querySelector('.show-arguments-toggle')?.addEventListener('click', function (e) {
stackItem.querySelector('.toggleFunctionArguments')?.addEventListener('click', function (e) {
e.stopPropagation();
stackItem.getElementsByClassName('function-arguments-wrap')[0].classList.toggle('hidden');
stackItem.getElementsByClassName('functionArguments')[0].classList.toggle('hidden');
});

// toggle code block visibility
Expand Down Expand Up @@ -295,14 +295,6 @@ class="copy-clipboard"

if (typeof code !== 'undefined') {
code.style.display = window.getComputedStyle(code).display === 'block' ? 'none' : 'block';
if (code.style.display === 'block') {
this.style.borderBottom = document.body.classList.contains('dark-theme')
? '1px solid #141414'
: '1px solid #d0d0d0'
;
} else {
this.style.borderBottom = 'none';
}
refreshCallStackItemCode(callStackItem);
}
});
Expand Down
Loading