fixes

BurningTreeC · Sep 21, 2024 · 39b5278 · 39b5278
1 parent 9ded17c
commit 39b5278
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/TiddlyFlex/global/layout/templates.tid b/TiddlyFlex/global/layout/templates.tid
@@ -13,6 +13,7 @@ tags: $:/tags/Global
 		<$tiddlyflex-draggable enable={{{ [{$:/state/tiddlyflex/story-river/tiddler/drag-enabled}match[yes]then[$:/state/tiddlyflex/story-river/fullscreen/]addsuffix<currentTiddler>is[missing]then[yes]] ~[[no]] }}} tiddler=<<currentTiddler>> startactions=<<tiddlyflex-drag-start-actions>> endactions=<<tiddlyflex-drag-end-actions>> class="tc-tiddler-frame">
 			<$vars
 				storyTiddler=<<currentTiddler>>
+				qualifiedSearchPanelState=<<qualify "$:/temp/searchpanel">>
 				newTagNameTiddler=<<qualify "$:/temp/NewTagName">>
 				newFieldNameTiddler=<<qualify "$:/temp/NewFieldName">>
 				newFieldValueTiddlerPrefix=<<qualify "$:/temp/NewFieldValue">>

diff --git a/TiddlyFlex/global/navigation/navigation.tid b/TiddlyFlex/global/navigation/navigation.tid
@@ -170,6 +170,7 @@ tags: $:/tags/Global
 </$let>
 <<delete-edittemplate-state-tiddlers>>
 <$action-deletetiddler $tiddler={{{ [[$:/state/tiddlyflex/story-river/fullscreen/]addsuffix<currentTiddler>] }}}/>
+<$action-deletetiddler $tiddler=<<qualifiedSearchPanelState>>/>
 <$let scrollTiddler={{{ [<tdff.tiddlyflex-story-river-filter>] +[after<currentTiddler>] ~[<tdff.tiddlyflex-story-river-filter>before<currentTiddler>] }}}>
 	<$action-setfield $tiddler=<<tv-history-list>> current-tiddler=<<scrollTiddler>>/>
 	<$action-sendmessage

diff --git a/TiddlyFlex/plugin.info b/TiddlyFlex/plugin.info
@@ -4,7 +4,7 @@
 	"name": "TiddlyFlex",
 	"plugin-type": "plugin",
 	"author": "Simon Huber",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"core-version": ">=5.3.3",
 	"source": "https://github.com/BurningTreeC/TiddlyFlex",
 	"list": "readme license"

diff --git a/TiddlyFlex/ui/Templates/EditTemplate.tid b/TiddlyFlex/ui/Templates/EditTemplate.tid
@@ -3,7 +3,7 @@ code-body: yes
 
 \procedure delete-edittemplate-state-tiddlers()
 <$set name="safeNewFieldValueTiddlerPrefix" value=<<newFieldValueTiddlerPrefix>> emptyValue=<<qualify "$:/temp/NewFieldValue">> >
-	<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix[$:/temp/NewFieldValue]prefix<safeNewFieldValueTiddlerPrefix>] [<newFieldNameInputTiddler>] [<newFieldNameSelectionTiddler>] [<newTagNameTiddler>] [<newTagNameInputTiddler>] [<newTagNameSelectionTiddler>] [<typeInputTiddler>] [<typeSelectionTiddler>]"/>
+	<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix[$:/temp/NewFieldValue]prefix<safeNewFieldValueTiddlerPrefix>] [<newFieldNameInputTiddler>] [<newFieldNameSelectionTiddler>] [<newTagNameTiddler>] [<newTagNameInputTiddler>] [<newTagNameSelectionTiddler>] [<typeInputTiddler>] [<typeSelectionTiddler>] [prefix[$:/state/codemirror-6/fullscreen/]]"/>
 </$set>
 \end
 
@@ -19,7 +19,11 @@ code-body: yes
 <%if [[$message$]match[delete]] %>
 	<<tiddlyflex-delete-draft-tiddler-actions>>
 <% elseif [[$message$]match[cancel]] %>
-	<<tiddlyflex-cancel-draft-tiddler-actions>>
+	<%if [<qualifiedSearchPanelState>is[missing]] %>
+		<<tiddlyflex-cancel-draft-tiddler-actions>>
+	<% else %>
+		<$action-deletetiddler $tiddler=<<qualifiedSearchPanelState>>/>
+	<% endif %>
 <% endif %>
 \end