From 04ad642be7721a57f07dadeaac6dd769b930a613 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Wed, 9 Apr 2025 22:01:43 +0100 Subject: [PATCH] Refactor most of this PR into the "Internals" plugin --- core/language/en-GB/Search.multids | 1 - .../wiki/tags/AdvancedSearchFilterResults.tid | 2 - .../internals}/InspectFilterMacro.tid | 1 - .../internals/InspectResultsTab.tid | 5 +- .../internals}/inspect Operator.tid | 0 .../inspect-filter Macro (Examples).tid | 0 .../tiddlywiki/internals}/inspect-filter.tid | 2 +- .../tiddlywiki/internals/modules}/inspect.js | 2 +- plugins/tiddlywiki/internals/styles.tid | 56 +++++++++++++++++++ .../internals/tests/wikitext}/Simple.tid | 0 themes/tiddlywiki/vanilla/base.tid | 56 ------------------- 11 files changed, 61 insertions(+), 64 deletions(-) delete mode 100644 core/wiki/tags/AdvancedSearchFilterResults.tid rename {editions/tw5.com/tiddlers/macros => plugins/tiddlywiki/internals}/InspectFilterMacro.tid (97%) rename core/ui/AdvancedSearch/FilterResults/Inspect.tid => plugins/tiddlywiki/internals/InspectResultsTab.tid (56%) rename {editions/tw5.com/tiddlers/filters => plugins/tiddlywiki/internals}/inspect Operator.tid (100%) rename {editions/tw5.com/tiddlers/macros/examples => plugins/tiddlywiki/internals}/inspect-filter Macro (Examples).tid (100%) rename {core/wiki/macros => plugins/tiddlywiki/internals}/inspect-filter.tid (99%) rename {core/modules/filters => plugins/tiddlywiki/internals/modules}/inspect.js (97%) rename {editions/test/tiddlers/tests/data/inspect-filter => plugins/tiddlywiki/internals/tests/wikitext}/Simple.tid (100%) diff --git a/core/language/en-GB/Search.multids b/core/language/en-GB/Search.multids index bf055cf86..7ab9284df 100644 --- a/core/language/en-GB/Search.multids +++ b/core/language/en-GB/Search.multids @@ -5,7 +5,6 @@ Filter/Caption: Filter Filter/Hint: Search via a [[filter expression|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<> matches// Filter/FilterResults/Results/Caption: Results -Filter/FilterResults/Inspect/Caption: Inspect Matches: //<> matches// Matches/All: All matches: Matches/NoMatch: //No match// diff --git a/core/wiki/tags/AdvancedSearchFilterResults.tid b/core/wiki/tags/AdvancedSearchFilterResults.tid deleted file mode 100644 index 1b0b28e9f..000000000 --- a/core/wiki/tags/AdvancedSearchFilterResults.tid +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/tags/AdvancedSearch/FilterResults -list: $:/core/ui/AdvancedSearch/Filter/FilterResults/Results $:/core/ui/AdvancedSearch/Filter/FilterResults/Inspect \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/macros/InspectFilterMacro.tid b/plugins/tiddlywiki/internals/InspectFilterMacro.tid similarity index 97% rename from editions/tw5.com/tiddlers/macros/InspectFilterMacro.tid rename to plugins/tiddlywiki/internals/InspectFilterMacro.tid index 3bf19462a..1d8653ea8 100644 --- a/editions/tw5.com/tiddlers/macros/InspectFilterMacro.tid +++ b/plugins/tiddlywiki/internals/InspectFilterMacro.tid @@ -1,7 +1,6 @@ caption: inspect-filter created: 20250401094200994 modified: 20250401094200994 -tags: Macros [[Core Macros]] title: inspect-filter Macro type: text/vnd.tiddlywiki diff --git a/core/ui/AdvancedSearch/FilterResults/Inspect.tid b/plugins/tiddlywiki/internals/InspectResultsTab.tid similarity index 56% rename from core/ui/AdvancedSearch/FilterResults/Inspect.tid rename to plugins/tiddlywiki/internals/InspectResultsTab.tid index a22777b58..fdb6189df 100644 --- a/core/ui/AdvancedSearch/FilterResults/Inspect.tid +++ b/plugins/tiddlywiki/internals/InspectResultsTab.tid @@ -1,6 +1,7 @@ -title: $:/core/ui/AdvancedSearch/Filter/FilterResults/Inspect +title: $:/plugins/tiddlywiki/internals/InspectResultsTab tags: $:/tags/AdvancedSearch/FilterResults -caption: {{$:/language/Search/Filter/FilterResults/Inspect/Caption}} +caption: Inspect +list-after: $:/core/ui/AdvancedSearch/Filter/FilterResults/Results \whitespace trim diff --git a/editions/tw5.com/tiddlers/filters/inspect Operator.tid b/plugins/tiddlywiki/internals/inspect Operator.tid similarity index 100% rename from editions/tw5.com/tiddlers/filters/inspect Operator.tid rename to plugins/tiddlywiki/internals/inspect Operator.tid diff --git a/editions/tw5.com/tiddlers/macros/examples/inspect-filter Macro (Examples).tid b/plugins/tiddlywiki/internals/inspect-filter Macro (Examples).tid similarity index 100% rename from editions/tw5.com/tiddlers/macros/examples/inspect-filter Macro (Examples).tid rename to plugins/tiddlywiki/internals/inspect-filter Macro (Examples).tid diff --git a/core/wiki/macros/inspect-filter.tid b/plugins/tiddlywiki/internals/inspect-filter.tid similarity index 99% rename from core/wiki/macros/inspect-filter.tid rename to plugins/tiddlywiki/internals/inspect-filter.tid index 241144c9c..13e55f594 100644 --- a/core/wiki/macros/inspect-filter.tid +++ b/plugins/tiddlywiki/internals/inspect-filter.tid @@ -1,4 +1,4 @@ -title: $:/core/macros/inspect-filter +title: $:/plugins/tiddlywiki/internals/inspect-filter tags: $:/tags/Macro \whitespace trim diff --git a/core/modules/filters/inspect.js b/plugins/tiddlywiki/internals/modules/inspect.js similarity index 97% rename from core/modules/filters/inspect.js rename to plugins/tiddlywiki/internals/modules/inspect.js index 483048863..2ff8c2cc0 100644 --- a/core/modules/filters/inspect.js +++ b/plugins/tiddlywiki/internals/modules/inspect.js @@ -1,5 +1,5 @@ /*\ -title: $:/core/modules/filters/inspect.js +title: $:/plugins/tiddlywiki/internals/filters/inspect.js type: application/javascript module-type: filteroperator diff --git a/plugins/tiddlywiki/internals/styles.tid b/plugins/tiddlywiki/internals/styles.tid index 73f3f068d..dbc1f99c0 100644 --- a/plugins/tiddlywiki/internals/styles.tid +++ b/plugins/tiddlywiki/internals/styles.tid @@ -2,3 +2,59 @@ title: $:/plugins/tiddlywiki/internals/styles tags: $:/tags/Stylesheet \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock + + +/* +** Filter Inspection +*/ + +.tc-inspect-filter-box { + --box-background-color: <>; + --box-foreground-color: <>; +} + +.tc-inspect-filter-box.tc-inspect-filter-box-horizontal { + display: flex; +} + +.tc-inspect-filter-box.tc-inspect-filter-box-horizontal > .tc-box > .tc-box-content, +.tc-inspect-filter-box.tc-inspect-filter-box-horizontal .tc-inspect-run-box > .tc-box-content, +.tc-inspect-filter-box.tc-inspect-filter-box-horizontal .tc-inspect-operation-box > .tc-box-content, +.tc-inspect-filter-box.tc-inspect-filter-box-horizontal .tc-inspect-operator-box > .tc-box-content { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: flex-start; +} + +.tc-inspect-operations-wrapper { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: stretch; +} + +.tc-inspect-run-box { + --box-background-color: #ffc; + --box-foreground-color: #440; +} + +.tc-inspect-operation-box { + --box-background-color: #cfc; + --box-foreground-color: #040; +} + +.tc-inspect-operator-box { + --box-background-color: #fcc; + --box-foreground-color: #400; +} + +.tc-box.tc-inspect-input-box { + --box-background-color: #fcf; + --box-foreground-color: #404; +} + +.tc-box.tc-inspect-output-box { + --box-background-color: #cff; + --box-foreground-color: #044; +} diff --git a/editions/test/tiddlers/tests/data/inspect-filter/Simple.tid b/plugins/tiddlywiki/internals/tests/wikitext/Simple.tid similarity index 100% rename from editions/test/tiddlers/tests/data/inspect-filter/Simple.tid rename to plugins/tiddlywiki/internals/tests/wikitext/Simple.tid diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index cb3d0c92f..a6de2917e 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -3589,62 +3589,6 @@ span.tc-translink > a:first-child { } - -/* -** Filter Inspection -*/ - -.tc-inspect-filter-box { - --box-background-color: <>; - --box-foreground-color: <>; -} - -.tc-inspect-filter-box.tc-inspect-filter-box-horizontal { - display: flex; -} - -.tc-inspect-filter-box.tc-inspect-filter-box-horizontal > .tc-box > .tc-box-content, -.tc-inspect-filter-box.tc-inspect-filter-box-horizontal .tc-inspect-run-box > .tc-box-content, -.tc-inspect-filter-box.tc-inspect-filter-box-horizontal .tc-inspect-operation-box > .tc-box-content, -.tc-inspect-filter-box.tc-inspect-filter-box-horizontal .tc-inspect-operator-box > .tc-box-content { - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: flex-start; -} - -.tc-inspect-operations-wrapper { - display: flex; - flex-direction: column; - justify-content: flex-start; - align-items: stretch; -} - -.tc-inspect-run-box { - --box-background-color: #ffc; - --box-foreground-color: #440; -} - -.tc-inspect-operation-box { - --box-background-color: #cfc; - --box-foreground-color: #040; -} - -.tc-inspect-operator-box { - --box-background-color: #fcc; - --box-foreground-color: #400; -} - -.tc-box.tc-inspect-input-box { - --box-background-color: #fcf; - --box-foreground-color: #404; -} - -.tc-box.tc-inspect-output-box { - --box-background-color: #cff; - --box-foreground-color: #044; -} - /* ** Flexbox utility classes */