Fix for list widget with an empty paragraph as inline template

Fixes #7902
Merge branch 'tiddlywiki-com'
2026-05-28 16:22:18 +00:00 · 2023-12-21 09:52:40 +00:00 · 2023-12-17 19:51:17 +00:00 · 2023-12-17 18:57:16 +00:00 · 2023-12-14 09:40:21 +00:00 · 2023-12-14 09:05:48 +00:00
9 changed files with 28 additions and 103 deletions
@@ -216,8 +216,6 @@ WikiParser.prototype.parsePragmas = function() {
 			subTree[0].children = [];
 			currentTreeBranch = subTree[0].children;
 		}
-		// Skip whitespace after the pragma
-		this.skipWhitespace();
 	}
 	return currentTreeBranch;
 };
@@ -109,6 +109,7 @@ ListWidget.prototype.findExplicitTemplates = function() {
 	this.explicitJoinTemplate = null;
 	this.hasTemplateInBody = false;
 	var searchChildren = function(childNodes) {
+		var foundInlineTemplate = false;
 		$tw.utils.each(childNodes,function(node) {
 			if(node.type === "list-template") {
 				self.explicitListTemplate = node.children;
@@ -118,12 +119,14 @@ ListWidget.prototype.findExplicitTemplates = function() {
 				self.explicitJoinTemplate = node.children;
 			} else if(node.type === "element" && node.tag === "p") {
 				searchChildren(node.children);
+				foundInlineTemplate = true;
 			} else {
-				self.hasTemplateInBody = true;
+				foundInlineTemplate = true;
 			}
 		});
+		return foundInlineTemplate;
 	};
-	searchChildren(this.parseTreeNode.children);
+	this.hasTemplateInBody = searchChildren(this.parseTreeNode.children);
 }

 ListWidget.prototype.getTiddlerList = function() {
@@ -0,0 +1,13 @@
+title: ListWidget/WithEmptyParagraphTemplate
+description: List widget with an empty paragraph as inline template
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+
+title: Output
+
+<$list filter="1"><p/></$list>
+
+title: ExpectedResult
+
+<p><p></p></p>
@@ -1,64 +0,0 @@
-title: Pragmas/WhitespaceAfterPragma
-description: parsermode pragma
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-<$wikify name="parsetree" text={{Text}} mode="inline" output="parsetree">
-<$text text=<<parsetree>>/>
-</$wikify>
-+
-title: Text
-
-\procedure this-is-a-definition() Something
-
-
-
-
-Now!
-
-+
-title: ExpectedResult
-
-<p>
-[
-    {
-        "type": "set",
-        "attributes": {
-            "name": {
-                "name": "name",
-                "type": "string",
-                "value": "this-is-a-definition"
-            },
-            "value": {
-                "name": "value",
-                "type": "string",
-                "value": "Something"
-            }
-        },
-        "children": [
-            {
-                "type": "text",
-                "text": "Now!\n",
-                "start": 48,
-                "end": 53
-            }
-        ],
-        "params": [],
-        "orderedAttributes": [
-            {
-                "name": "name",
-                "type": "string",
-                "value": "this-is-a-definition"
-            },
-            {
-                "name": "value",
-                "type": "string",
-                "value": "Something"
-            }
-        ],
-        "isProcedureDefinition": true
-    }
-]
-</p>
@@ -1,32 +0,0 @@
-title: Pragmas/WhitespaceNoPragma
-description: parsermode pragma
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-<$wikify name="parsetree" text={{Text}} mode="inline" output="parsetree">
-<$text text=<<parsetree>>/>
-</$wikify>
-+
-title: Text
-
-
-
-
-
-Now!
-
-+
-title: ExpectedResult
-
-<p>
-[
-    {
-        "type": "text",
-        "text": "\n\n\n\nNow!\n",
-        "start": 0,
-        "end": 9
-    }
-]
-</p>
@@ -11,4 +11,6 @@ The `tm-delete-tiddler` message deletes the specified tiddler and removes it fro
 |param |Title of the tiddler that is to be deleted |
 |tiddlerTitle |Fallback title that is used if ''param'' isn't specified (automatically set by the ButtonWidget)  |

-The delete tiddler message is usually generated with the ButtonWidget and is handled by the NavigatorWidget.
+The delete tiddler message is usually generated with the ButtonWidget and is handled by the NavigatorWidget.
+
+Use the [[ActionDeleteTiddlerWidget]] to delete a named tiddler without getting the "Do you wish to delete the tiddler" prompt.
@@ -1,5 +1,5 @@
 created: 20220917112233317
-modified: 20230419103154328
+modified: 20231217185535715
 tags: Pragmas
 title: Pragma: \define
 type: text/vnd.tiddlywiki
@@ -48,4 +48,6 @@ $caption$
 <<special-button>>
 """>>

+<<.warning """If macros are nested, textual substitution will only occur for the outermost macro. Thi is because by the time the inner macros are processed all the substitutions will have already occurred""">>
+
 A more formal [[presentation|Macro Definition Syntax]] of this syntax is also available.
@@ -1,6 +1,6 @@
 caption: genesis
 created: 20221101100729587
-modified: 20230115101800345
+modified: 20231214093716044
 tags: Widgets
 title: GenesisWidget
 type: text/vnd.tiddlywiki
@@ -15,6 +15,7 @@ The content of the <<.wid genesis>> widget is used as the content of the dynamic

 |!Attribute |!Description |
 |$type |The type of widget or element to create (an initial `$` indicates a widget, otherwise an HTML element will be created) |
+|$remappable |Set to "no" to prevent the generated widget from being affected by any custom widget overrides. Needed when invoking the original widget within a custom widget definition |
 |$names |An optional filter evaluating to the names of a list of attributes to be applied to the widget |
 |$values |An optional filter evaluating to the values corresponding to the list of names specified in <<.attr $names>> |
 |$mode |An optional override of the parsing mode. May be "inline" or "block" |
@@ -557,3 +557,5 @@ Wang Ke, @Gk0Wk, 2023/10/17
@frittro, 2023/10/27

@etardiff, 2023/12/10
+
+John Long, @drevarr, 2023/12/12
Author	SHA1	Message	Date
Jeremy Ruston	1dc4b6d173	Fix for list widget with an empty paragraph as inline template Fixes #7902	2023-12-21 09:52:40 +00:00
Jeremy Ruston	d2d00ffa4d	Merge branch 'tiddlywiki-com'	2023-12-17 19:51:17 +00:00
Jeremy Ruston	c6a72875ba	Docs: Warn about textual substitution with nested macros	2023-12-17 18:57:16 +00:00
Jeremy Ruston	aaf7dc355d	Add docs for "remappable' attribute of genesis widget	2023-12-14 09:40:21 +00:00
Jeremy Ruston	e131dd3761	Revert "Update ViewWidget.tid to include common variants (#3895 )" This reverts commit `cdfa4b6082`.	2023-12-14 09:05:48 +00:00
Drevarr	f697f008b1	Signing the CLA (#7886 )	2023-12-14 08:22:33 +00:00
TonyM	cdfa4b6082	Update ViewWidget.tid to include common variants (#3895 ) * Update ViewWidget.tid to include common varients The provision of common variates to the view widget provides new an experience user examples of the different variants of the ViewWidget. The copy to clipboad method allows each variant to be quickly accessed and pasted into their wiki. To facilitate this a new macro wikitext-example-compact has being added to $:/editions/tw5.com/wikitext-macros * Update ViewWidget.tid Two colons added to maintain indenting in new content.	2023-12-13 18:16:57 +00:00
TonyM	8051a3dea2	Update WidgetMessage_ tm-delete-tiddler.tid (#3924 ) Adding the line Use the [[ActionDeleteTiddlerWidget]] to delete a named tiddler without getting the "Do you wish to delete the tiddler" prompt. However If someone knows how to make "WidgetMessage: tm-delete-tiddler" do this please explain.	2023-12-13 18:12:41 +00:00