NOW MANAGED ON CODEBERG
Comments: Fixed display, added archive list support for editor toolbox
Dan Browna27df485bb19
diff --git a/lang/en/entities.php b/lang/en/entities.phpindex e25a83299..6e616ded4 100644--- a/lang/en/entities.php+++ b/lang/en/entities.php@@ -396,6 +396,7 @@ return ['comment_placeholder' => 'Leave a comment here','comment_thread_count' => ':count Comment Thread|:count Comment Threads','comment_archived_count' => ':count Archived',+ 'comment_archived_threads' => 'Archived Threads','comment_save' => 'Save Comment','comment_new' => 'New Comment','comment_created' => 'commented :createDiff',diff --git a/resources/js/components/page-comment-reference.ts b/resources/js/components/page-comment-reference.tsindex 5a71f0c51..48fb8ee0a 100644--- a/resources/js/components/page-comment-reference.ts+++ b/resources/js/components/page-comment-reference.ts@@ -34,13 +34,26 @@ export class PageCommentReference extends Component {window.addEventListener('editor-toolbox-change', (event) => {const tabName: string = (event as {detail: {tab: string, open: boolean}}).detail.tab;const isOpen = (event as {detail: {tab: string, open: boolean}}).detail.open;- if (tabName === 'comments' && isOpen) {+ if (tabName === 'comments' && isOpen && this.link.checkVisibility()) {this.showForEditor();} else {this.hideMarker();}});+ // Handle visibility changes within editor toolbox archived details dropdown+ window.addEventListener('toggle', event => {+ if (event.target instanceof HTMLElement && event.target.contains(this.link)) {+ window.requestAnimationFrame(() => {+ if (this.link.checkVisibility()) {+ this.showForEditor();+ } else {+ this.hideMarker();+ }+ });+ }+ }, {capture: true});+// Handle comments tab changes to hide/show markers & indicatorswindow.addEventListener('tabs-change', event => {const sectionId = (event as {detail: {showing: string}}).detail.showing;diff --git a/resources/sass/_components.scss b/resources/sass/_components.scssindex a86d31ce3..faeb2e051 100644--- a/resources/sass/_components.scss+++ b/resources/sass/_components.scss@@ -1202,4 +1202,19 @@ input.scroll-box-search, .scroll-box-header-item {}.scroll-box > li.empty-state:last-child {display: list-item;+}++details.section-expander summary {+ border-top: 1px solid #DDD;+ font-weight: bold;+ font-size: 12px;+ color: #888;+ cursor: pointer;+ padding-block: vars.$xs;+}+details.section-expander:open summary {+ margin-bottom: vars.$s;+}+details.section-expander {+ border-bottom: 1px solid #DDD;}\ No newline at end of filediff --git a/resources/views/pages/parts/toolbox-comments.blade.php b/resources/views/pages/parts/toolbox-comments.blade.phpindex d632b85c6..72958a2fe 100644--- a/resources/views/pages/parts/toolbox-comments.blade.php+++ b/resources/views/pages/parts/toolbox-comments.blade.php@@ -1,3 +1,6 @@+{{--+$comments - CommentTree+--}}<div refs="editor-toolbox@tab-content" data-tab-content="comments" class="toolbox-tab-content"><h4>{{ trans('entities.comments') }}</h4>@@ -5,11 +8,19 @@<p class="text-muted small mb-m">{{ trans('entities.comment_editor_explain') }}</p>- @foreach($comments->get() as $branch)+ @foreach($comments->getActive() as $branch)@include('comments.comment-branch', ['branch' => $branch, 'readOnly' => true])@endforeach@if($comments->empty())- <p class="italic text-muted">{{ trans('common.no_items') }}</p>+ <p class="italic text-muted">{{ trans('entities.comment_none') }}</p>+ @endif+ @if($comments->archivedThreadCount() > 0)+ <details class="section-expander mt-s">+ <summary>{{ trans('entities.comment_archived_threads') }}</summary>+ @foreach($comments->getArchived() as $branch)+ @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => true])+ @endforeach+ </details>@endif</div></div>\ No newline at end of file