feat: added ability to globally turn off Admonition Color being set d…

…irectly on element feat: added ability to turn off Admonition Color per admonition type if the admonition color is turned off, it must be set via CSS
javalent · Nov 1, 2021 · afbcc23 · afbcc23
1 parent 245fbe2
commit afbcc23
Show file tree

Hide file tree

Showing 8 changed files with 3,167 additions and 228 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,9 +7,13 @@
         "rollup:dev": "rollup --config rollup.config-dev.js -w",
         "rollup:publish": "rollup --config rollup.publish.js -w",
         "rollup:build": "rollup --config rollup.config.js",
-        "dev": "webpack --config webpack.dev.js -w",
+        "dev": "set NODE_OPTIONS=--openssl-legacy-provider && webpack --config webpack.dev.js -w",
         "publish": "webpack --config webpack.publish.js",
-        "build": "npm run publish && webpack"
+        "build": "npm run publish && webpack",
+        "release": "standard-version"
+    },
+    "standard-version": {
+        "t": ""
     },
     "keywords": [],
     "author": "Jeremy Valentine",
@@ -39,6 +43,7 @@
         "webpack-cli": "^4.7.2"
     },
     "dependencies": {
-        "@fortawesome/free-brands-svg-icons": "^5.15.4"
+        "@fortawesome/free-brands-svg-icons": "^5.15.4",
+        "standard-version": "^9.3.2"
     }
 }
diff --git a/src/@types/index.ts b/src/@types/index.ts
@@ -7,6 +7,7 @@ export interface Admonition {
     icon: AdmonitionIconDefinition;
     color: string;
     command: boolean;
+    injectColor: boolean;
 }
 
 export interface INestedAdmonition {
@@ -27,6 +28,7 @@ export interface ISettingsData {
     syncLinks: boolean;
     version: string;
     enableMarkdownProcessor: boolean;
+    injectColor: boolean;
 }
 
 export type AdmonitionIconDefinition = {

diff --git a/src/assets/main.css b/src/assets/main.css
@@ -231,6 +231,14 @@ input.is-invalid {
     width: 1em;
 }
 
+.admonition-color-settings .setting-item-control {
+    gap: 1rem;
+}
+.admonition-color-settings input[type="color"]:disabled {
+    opacity: 0.75;
+    cursor: not-allowed;
+}
+
 /** Internal */
 
 .admonition li.task-list-item.is-checked p {

diff --git a/src/main.ts b/src/main.ts
@@ -94,7 +94,8 @@ const DEFAULT_APP_SETTINGS: ISettingsData = {
     autoCollapse: false,
     defaultCollapseType: "open",
     syncLinks: true,
-    enableMarkdownProcessor: false
+    enableMarkdownProcessor: false,
+    injectColor: true
 };
 
 export default class ObsidianAdmonition
@@ -395,12 +396,14 @@ export default class ObsidianAdmonition
                             "An admonition must have a title if it is collapsible."
                         );
                     }
-
+                    const admonition = this.admonitions[type];
                     const admonitionElement = await getAdmonitionElementAsync(
                         type,
                         title.trim(),
-                        this.admonitions[type].icon,
-                        this.admonitions[type].color,
+                        admonition.icon,
+                        admonition.injectColor ?? this.data.injectColor
+                            ? admonition.color
+                            : null,
                         collapse
                     );
 
@@ -664,13 +667,16 @@ title:
             const id = getID();
 
             /* const iconNode = icon ? this.admonitions[type].icon; */
-
+            const admonition = this.admonitions[type];
             let admonitionElement = getAdmonitionElement(
                 type,
                 title,
                 iconDefinitions.find(({ name }) => icon === name) ??
-                    this.admonitions[type].icon,
-                color ?? this.admonitions[type].color,
+                    admonition.icon,
+                color ??
+                    (admonition.injectColor ?? this.data.injectColor
+                        ? admonition.color
+                        : null),
                 collapse,
                 id
             );

diff --git a/src/modal/index.ts b/src/modal/index.ts
@@ -477,11 +477,15 @@ export class InsertAdmonitionModal extends Modal {
                         this.noTitle = false;
                     }
                     if (this.element) {
+                        const admonition = this.plugin.admonitions[this.type];
                         const element = getAdmonitionElement(
                             this.type,
                             this.title,
-                            this.plugin.admonitions[this.type].icon,
-                            this.plugin.admonitions[this.type].color,
+                            admonition.icon,
+                            admonition.injectColor ??
+                                this.plugin.data.injectColor
+                                ? admonition.color
+                                : null,
                             this.collapse
                         );
                         element.createDiv({
@@ -565,11 +569,14 @@ ${this.editor.getDoc().getSelection()}
     buildAdmonition() {
         this.admonitionEl.empty();
         if (this.type && this.plugin.admonitions[this.type]) {
+            const admonition = this.plugin.admonitions[this.type];
             this.element = getAdmonitionElement(
                 this.type,
                 this.title,
-                this.plugin.admonitions[this.type].icon,
-                this.plugin.admonitions[this.type].color,
+                admonition.icon,
+                admonition.injectColor ?? this.plugin.data.injectColor
+                    ? admonition.color
+                    : null,
                 this.collapse
             );
             this.element.createDiv({