$mol_text: fix types, edit .view.tree

hyoo-ru · Jul 21, 2024 · 1dcc137 · 1dcc137
1 parent 5f385e1
commit 1dcc137
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/text/text/text.view.css b/text/text/text.view.css
@@ -9,10 +9,6 @@
 	tab-size: 4;
 }
 
-[mol_text_spoiler] {
-	width: 100vw;
-}
-
 [mol_text_paragraph] {
 	padding: var(--mol_gap_text);
 	overflow: auto;
@@ -22,6 +18,10 @@
 	max-width: 60rem;
 }
 
+[mol_text_spoiler_label_paragraph] {
+	padding: 0;
+}
+
 [mol_text_span] {
 	display: inline;
 }

diff --git a/text/text/text.view.tree b/text/text/text.view.tree
@@ -76,11 +76,16 @@ $mol_text $mol_list
 	Embed* $mol_embed_any
 		uri <= link_uri* \
 		title <= line_text* \
+	- \Spoilers
 	Spoiler* $mol_expander
-		label <= spoiler_label* /
-		content <= spoiler_content* /
-	Spoiler_text* $mol_text
-		text <= spoiler_text* \
+		label /
+			<= spoiler_label*
+		content /
+			<= spoiler_content*
+	Spoiler_label* $mol_text
+		text <= spoiler_label_text* \
+	Spoiler_content* $mol_text
+		text <= spoiler_content_text* \
 
 $mol_text_header $mol_paragraph
 	level 1

diff --git a/text/text/text.view.ts b/text/text/text.view.ts
@@ -303,19 +303,30 @@ namespace $.$$ {
 		}
 
 		@ $mol_mem_key
-		spoiler_label( index: number ) {
-			return this.flow_tokens()[ index ].chunks[0].replace( /^[\?] /mg , '' ).split('\n')[0];
+		spoiler_text( index: number ): string {
+			return this.flow_tokens()[ index ].chunks[0].replace( /^[\?] /mg , '' );
+		}
+
+		@ $mol_mem_key
+		spoiler_label_text( index: number ): string {
+			return this.spoiler_text(index).split('\n')[0];
 		}
 
 		@ $mol_mem_key
-		spoiler_content( index: number, next?: readonly any[] | undefined ): readonly any[] {
-			return [this.Spoiler_text(index)];
+		spoiler_content_text( index: number): string {
+			return this.spoiler_text(index).split('\n').slice(1).join('\n');
 		}
 
 		@ $mol_mem_key
-		spoiler_text(index: number): string {
-			return this.flow_tokens()[ index ].chunks[0].replace( /^[\?] /mg , '' ).split('\n').slice(1).join('\n');
+		spoiler_label( index: number ): any {
+			return this.Spoiler_label(index);
 		}
+
+		@ $mol_mem_key
+		spoiler_content( index: number ): any {
+			return this.Spoiler_content(index);
+		}
+
 	}
 
 	export class $mol_text_header extends $.$mol_text_header {