Merge branch 'master' of https://github.com/code-of-chaos/obsidian-co…

…lored_tags_wrangler
code-of-chaos · Jan 27, 2024 · 4233421 · 4233421
2 parents 895304b + c2851e2
commit 4233421
Show file tree

Hide file tree

Showing 40 changed files with 206 additions and 151 deletions.
diff --git a/src/api/tags.ts b/src/api/tags.ts
@@ -21,9 +21,9 @@ export function get_tags(data: Array<IColorPicker>, enable_multiple_tags: boolea
 
             return tag_name // read the last line if you are confused why we are looping over the tag_name
                 .split(reSplit)
-                .map(tag => tag.trim().toLowerCase())  // Also trim the tag for leading spaces & map everything to lowercase!
+                .map(tag => tag.trim())  // Also trim the tag for leading spaces & map everything to lowercase!
                 .filter(Boolean) // filter out empty lines
                 .map(tag => remove_slash ? tag.replace(reSLASH, "") : tag)  // replace the "/"
                 .map(tag => ({ tag_name: tag, color, background_color, luminance_offset }));
         });
-}
+}
diff --git a/src/main.ts b/src/main.ts
@@ -59,6 +59,11 @@ export default class ColoredTagWrangler extends Plugin implements IColoredTagWra
 				name:"EXPERIMENTAL : export TAGS LINKED TO FOLDER NOTES to graph.json. This overwrites your current graph.json. Use at own risk!",
 				callback: async () => await experimental.exportGraphJsonFolderNotes(this)
 			})
+			this.addCommand({
+				id:"export-css-to-codeblock",
+				name:"EXPERIMENTAL : CSS Styling to code block.",
+				editorCallback: async (editor, ctx) => await experimental.ExportToCSS(editor, ctx, this)
+			})
 		}
 	}
 

diff --git a/src/plugin/commands/ExportGraphJsonTagsCodeblock.ts b/src/plugin/commands/ExportGraphJsonTagsCodeblock.ts
@@ -9,7 +9,7 @@ import {IColorGroup} from "src/api/graph";
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------
-export async function ExportGraphJsonTagsCodeblock(editor: Editor, ctx: MarkdownView | MarkdownFileInfo, plugin: IColoredTagWrangler){
+export async function ExportGraphJsonTagsCodeblock(editor: Editor, _: MarkdownView | MarkdownFileInfo, plugin: IColoredTagWrangler){
     const color_groups = get_tags(plugin.settings.TagColors.ColorPicker, plugin.settings?.TagColors.EnableMultipleTags)
         .map(({tag_name, color}) => {
             return {
@@ -29,4 +29,4 @@ export async function ExportGraphJsonTagsCodeblock(editor: Editor, ctx: Markdown
         ].join("\n")
     )
 
-}
+}
diff --git a/src/plugin/commands/experimental/ExportToCSS.ts b/src/plugin/commands/experimental/ExportToCSS.ts
@@ -0,0 +1,19 @@
+// ---------------------------------------------------------------------------------------------------------------------
+// Imports
+// ---------------------------------------------------------------------------------------------------------------------
+import {IColoredTagWrangler} from "src/plugin/IColoredTagWrangler";
+import {Editor, MarkdownFileInfo, MarkdownView} from "obsidian";
+
+// ---------------------------------------------------------------------------------------------------------------------
+// Code
+// ---------------------------------------------------------------------------------------------------------------------
+export async function ExportToCSS(editor: Editor, _: MarkdownView | MarkdownFileInfo, plugin: IColoredTagWrangler){
+    editor.replaceSelection(
+        [
+            "```css",
+			...plugin.style_manager.getAllCssStyling(),
+            "```",
+        ].join("\n")
+    )
+
+}
diff --git a/src/plugin/commands/experimental/index.ts b/src/plugin/commands/experimental/index.ts
@@ -1,2 +1,3 @@
 export * from './ExportGraphJsonTags';
-export * from './ExportGraphJsonFolderNotes';
+export * from './ExportGraphJsonFolderNotes';
+export * from './ExportToCSS';
diff --git a/src/plugin/event_handlers/FileOpen.ts b/src/plugin/event_handlers/FileOpen.ts
@@ -1,13 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-
 import {TFile} from "obsidian";
-import $ from "jquery";
-
 import {EventHandler} from "src/plugin/event_handlers/EventHandler";
-import {get_tags} from "src/api/tags";
-import {rgbToString} from "src/api/ColorConverters";
 
 // ---------------------------------------------------------------------------------------------------------------------
 // Code

diff --git a/src/plugin/event_handlers/MetadataChange.ts b/src/plugin/event_handlers/MetadataChange.ts
@@ -1,12 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {
-    CachedMetadata,
-    TFile
-} from "obsidian";
+import {CachedMetadata, TFile} from "obsidian";
 import {file_is_folderNote, processTagColors} from "src/api/FolderNoteLogic";
-import {v4 as uuid4} from "uuid";
 import {EventHandler} from "src/plugin/event_handlers/EventHandler";
 
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/SettingsTabComponent.ts b/src/plugin/setting_tab/SettingsTabComponent.ts
@@ -1,11 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import ColoredTagWranglerPlugin
-	from "src/main";
-import {
-	PluginSettingTab,
-} from "obsidian";
+import ColoredTagWranglerPlugin from "src/main";
+import {PluginSettingTab,} from "obsidian";
 // ---------------------------------------------------------------------------------------------------------------------
 // Interface
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/components/ComponentCSSNoteBackground.ts b/src/plugin/setting_tab/components/ComponentCSSNoteBackground.ts
@@ -1,10 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/components/ComponentCSSNoteTags.ts b/src/plugin/setting_tab/components/ComponentCSSNoteTags.ts
@@ -1,10 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/components/ComponentCSSTagsNoWrap.ts b/src/plugin/setting_tab/components/ComponentCSSTagsNoWrap.ts
@@ -1,14 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
-// ---------------------------------------------------------------------------------------------------------------------
-// Support Code
-// ---------------------------------------------------------------------------------------------------------------------
-const INVALID_CHAR = [' ', ';', '}', '{']
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
 
 // ---------------------------------------------------------------------------------------------------------------------
 // Code

diff --git a/src/plugin/setting_tab/components/ComponentDebug.ts b/src/plugin/setting_tab/components/ComponentDebug.ts
@@ -1,10 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/components/ComponentDebugExperimentalCommands.ts b/src/plugin/setting_tab/components/ComponentDebugExperimentalCommands.ts
@@ -1,10 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/components/ComponentDebugReloadCSS.ts b/src/plugin/setting_tab/components/ComponentDebugReloadCSS.ts
@@ -1,10 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/components/ComponentFolderNote.ts b/src/plugin/setting_tab/components/ComponentFolderNote.ts
@@ -1,10 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/components/ComponentFolderNoteDetect.ts b/src/plugin/setting_tab/components/ComponentFolderNoteDetect.ts
@@ -1,12 +1,9 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
-import {detect_all_links}
-	from "src/api/FolderNoteLogic"
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
+import {detect_all_links} from "src/api/FolderNoteLogic"
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/components/ComponentFolderNoteFolderTagLinks.ts b/src/plugin/setting_tab/components/ComponentFolderNoteFolderTagLinks.ts
@@ -1,10 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
 import {arrayMove} from "../../../api/ArrayUtils";
 // ---------------------------------------------------------------------------------------------------------------------
 // Code

diff --git a/src/plugin/setting_tab/components/ComponentKanban.ts b/src/plugin/setting_tab/components/ComponentKanban.ts
@@ -1,10 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/components/ComponentKanbanCards.ts b/src/plugin/setting_tab/components/ComponentKanbanCards.ts
@@ -1,10 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/components/ComponentKanbanHideHashtags.ts b/src/plugin/setting_tab/components/ComponentKanbanHideHashtags.ts
@@ -1,10 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/components/ComponentKanbanLists.ts b/src/plugin/setting_tab/components/ComponentKanbanLists.ts
@@ -1,10 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {Setting}
-	from "obsidian";
-import {SettingsTabComponent}
-	from "src/plugin/setting_tab/SettingsTabComponent";
+import {Setting} from "obsidian";
+import {SettingsTabComponent} from "src/plugin/setting_tab/SettingsTabComponent";
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/setting_tab/components/ComponentTagsEnableAutoBackgroundButton.ts b/src/plugin/setting_tab/components/ComponentTagsEnableAutoBackgroundButton.ts
@@ -23,6 +23,7 @@ export class ComponentTagsEnableAutoBackgroundButton extends SettingsTabComponen
 						.onChange(async state => {
 							this.plugin.settings.TagColors.EnableSeparateBackground = state;
 							await this.plugin.saveSettings();
+							this.settings_tab.display();
 						})
 				}
 			);

diff --git a/src/plugin/settings/DefaultSettings.ts b/src/plugin/settings/DefaultSettings.ts
@@ -12,9 +12,7 @@ export const DefaultSettings: ISettings = {
 		ColorPicker: [],
 
 		EnableMultipleTags:true,
-		EnableSeparateBackground:false,
-		EnableSeparateLuminanceOffset:false, 	// can be removed
-		EnableDarkLightDifference:true, 		// can be removed
+		EnableSeparateBackground:true,
 		EnableBackgroundOpacity:false,
 
 		Values:{
@@ -49,7 +47,7 @@ export const DefaultSettings: ISettings = {
 	},
 
 	Kanban:{
-		Enable:false,
+		Enable:true,
 		EnableCards:false,
 		EnableLists:false,
 		HideHashtags:false,
@@ -83,6 +81,6 @@ export const DefaultSettings: ISettings = {
 	},
 
 	Info: {
-		SettingsVersion: 13 // UPDATE THIS WHEN YOU CHANGE ANYTHING IN THE SETTINGS!!!
+		SettingsVersion: 14 // UPDATE THIS WHEN YOU CHANGE ANYTHING IN THE SETTINGS!!!
 	}
 }
diff --git a/src/plugin/settings/ISettings.ts b/src/plugin/settings/ISettings.ts
@@ -13,8 +13,6 @@ export interface ISettings {
 
         EnableMultipleTags:boolean,
         EnableSeparateBackground:boolean,
-        EnableSeparateLuminanceOffset:boolean,
-        EnableDarkLightDifference:boolean,
         EnableBackgroundOpacity:boolean,
         Values:{
             BackgroundOpacity:number,

diff --git a/src/plugin/settings/Migrate.ts b/src/plugin/settings/Migrate.ts
@@ -24,6 +24,7 @@ const MIGRATION_STEPS: ((data: any) => any)[] = [ // Using any's isn't perfect b
     (data) => migrations.migrate_10_to_11(data),
     (data) => migrations.migrate_11_to_12(data),
     (data) => migrations.migrate_12_to_13(data),
+    (data) => migrations.migrate_13_to_14(data),
 ];
 
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/src/plugin/settings/migrations/index.ts b/src/plugin/settings/migrations/index.ts
@@ -14,3 +14,4 @@ export * from 'src/plugin/settings/migrations/migrate_09_to_10';
 export * from 'src/plugin/settings/migrations/migrate_10_to_11';
 export * from 'src/plugin/settings/migrations/migrate_11_to_12';
 export * from 'src/plugin/settings/migrations/migrate_12_to_13';
+export * from 'src/plugin/settings/migrations/migrate_13_to_14';
diff --git a/src/plugin/settings/migrations/migrate_11_to_12.ts b/src/plugin/settings/migrations/migrate_11_to_12.ts
@@ -2,7 +2,7 @@
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
 import {ISettings_v011} from "src/plugin/settings/old_setting_versions";
-import {ISettings_v012} from "../old_setting_versions/ISettings_v012";
+import {ISettings_v012} from "src/plugin/settings/old_setting_versions";
 
 // ---------------------------------------------------------------------------------------------------------------------
 // Code

diff --git a/src/plugin/settings/migrations/migrate_12_to_13.ts b/src/plugin/settings/migrations/migrate_12_to_13.ts
@@ -1,14 +1,13 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
-import {ISettings} from "src/plugin/settings/ISettings";
-import {ISettings_v012} from "src/plugin/settings/old_setting_versions";
+import {ISettings_v012, ISettings_v013} from "src/plugin/settings/old_setting_versions";
 
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------
-export function migrate_12_to_13(loaded_data:ISettings_v012):ISettings {
-    let transformed_data = loaded_data as unknown as ISettings;
+export function migrate_12_to_13(loaded_data:ISettings_v012):ISettings_v013 {
+    let transformed_data = loaded_data as unknown as ISettings_v013;
 
     transformed_data.FolderNote.EnableBackgroundOpacity = loaded_data.TagColors.EnableBackgroundOpacity;
     transformed_data.FolderNote.Values.BackgroundOpacity = loaded_data.TagColors.Values.BackgroundOpacity;
@@ -20,5 +19,5 @@ export function migrate_12_to_13(loaded_data:ISettings_v012):ISettings {
     transformed_data.Canvas.Values.BackgroundOpacity = loaded_data.TagColors.Values.BackgroundOpacity;
 
     transformed_data.Info.SettingsVersion = 13;
-    return transformed_data as unknown as ISettings;
+    return transformed_data as unknown as ISettings_v013;
 }