Update 2.8.0

This is a major update to tbpl-expand in dynamic table
kookma · Apr 2, 2023 · 13d18a3 · 13d18a3
1 parent fe43775
commit 13d18a3
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 24 deletions.
diff --git a/docs/index.html b/docs/index.html
diff --git a/packaged/shiraz.tid b/packaged/shiraz.tid
diff --git a/source/shiraz/macros/dtables/tbl-expand.tid b/source/shiraz/macros/dtables/tbl-expand.tid
@@ -5,10 +5,22 @@ type: text/vnd.tiddlywiki
 \define display-expanded-record()
 <td colspan=<<ncols>> class="shiraz-dtable-expanded-record">
 <$tiddler tiddler=<<currentRecord>> >
-<$list filter="[<tempTableEdit>getindex[mode]match[edit]]" variable=ignore
-  emptyMessage="""<$transclude tiddler=<<currentRecord>> field=text mode=block/>""" >
-  <$edit-text class="tbl-inpt-edit" tiddler=<<currentRecord>> field="text" tag=textarea/>
+
+<!-- in edit mode select between two editors: simple textbox or TW main editor e.g. codemirror -->
+<$list filter="[<tempTableEdit>getindex[mode]match[edit]]" variable=ignore>
+<$reveal type="nomatch" state="$:/config/shiraz/dynamictables/editor-type" text="main-editor" tag="div">
+<$edit-text class="tbl-inpt-edit" tiddler=<<currentRecord>> field="text" tag=textarea/>
+</$reveal>
+<$reveal type="match" state="$:/config/shiraz/dynamictables/editor-type" text="main-editor" tag="div" class="shiraz-dtable-maineditor">
+{{||$:/core/ui/EditTemplate/body}}
+</$reveal>
+</$list>
+
+<!-- view mode -->
+<$list filter="[<tempTableEdit>getindex[mode]match[view]]" variable=ignore>
+{{||$:/core/ui/ViewTemplate/body}}
 </$list>
+
 </$tiddler>
 </td>
-\end
+\end
diff --git a/source/shiraz/plugin.info b/source/shiraz/plugin.info
@@ -3,7 +3,7 @@
     "name": "Shiraz",
     "description": "extended markups, styles, images, tables, and macros",
     "author": "Mohammad Rahmani",
-    "version": "2.7.7",
+    "version": "2.8.0",
     "core-version": ">=5.2.2",
     "source": "https://github.com/kookma/TW-Shiraz",
     "list": "readme license history",

diff --git a/source/shiraz/styles/dynamic-tables.css b/source/shiraz/styles/dynamic-tables.css
@@ -1,3 +1,14 @@
+/* main editor toolbar settings for dynamic table */
+.shiraz-dtable-maineditor .tc-editor-toolbar button svg{
+	height:0.9em;  /* make toolbar buttons smaller */
+	width:0.9em
+}
+/* make third party plugins like KaTeX button smaller */
+.shiraz-dtable-maineditor .tc-editor-toolbar button .katex{
+	font-size: 0.9em;
+	line-height:1em;
+}
+
 /* edit-text box for dynamic table */
 .shiraz-dtable-textbox {
 	width:100%;

diff --git a/source/shiraz/ui/ControlPanel/Settings.tid b/source/shiraz/ui/ControlPanel/Settings.tid
@@ -3,6 +3,8 @@ tags: $:/tags/ControlPanel/SettingsTab $:/tags/MoreSideBar
 title: $:/plugins/kookma/shiraz/ui/ControlPanel/Settings
 type: text/vnd.tiddlywiki
 
+\define dynamictables-editortype() $:/config/shiraz/dynamictables/editor-type
+
 These settings let you customise the behaviour of Shiraz plugin.
 
 ---
@@ -20,4 +22,6 @@ These settings let you customise the behaviour of Shiraz plugin.
 ;Set dark and light palettes
 {{$:/plugins/kookma/shiraz/ui/set-dark-light-palette}}
 
-
+; Choose Local Editor for Dynamic Table
+:<$checkbox tiddler=<<dynamictables-editortype>> field="text" checked="main-editor" unchecked="simple-textarea" default="simple-textarea"> Use Tiddlywiki main editor </$checkbox>
+:<$checkbox tiddler=<<dynamictables-editortype>> field="text" checked="simple-textarea" unchecked="main-editor" default="simple-textarea"> Use simple text area </$checkbox>