From 738a77eae12a9878fe8f7145327e5c994876201b Mon Sep 17 00:00:00 2001 From: CK <69121180+TfTHacker@users.noreply.github.com> Date: Fri, 27 Aug 2021 06:47:52 +0200 Subject: [PATCH 1/2] Move to esbuild, configure for vscode, configure for build folder output --- .gitignore | 8 +- LICENSE | 21 ++ main.js | 261 +++++++++++++++++++ package.json | 12 +- rollup.config.js | 30 --- main.ts => src/main.ts | 558 ++++++++++++++++++++--------------------- 6 files changed, 568 insertions(+), 322 deletions(-) create mode 100644 LICENSE create mode 100644 main.js delete mode 100644 rollup.config.js rename main.ts => src/main.ts (97%) diff --git a/.gitignore b/.gitignore index 2fd7c5e..2196514 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,12 @@ -# Intellij -*.iml -.idea +# editor +.vscode # npm node_modules package-lock.json # build -main.js -*.js.map +build # obsidian data.json diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..caf36ff --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 TfTHacker + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/main.js b/main.js new file mode 100644 index 0000000..1c40e20 --- /dev/null +++ b/main.js @@ -0,0 +1,261 @@ +/* +THIS IS A GENERATED/BUNDLED FILE BY ROLLUP +if you want to view the source visit the plugins github repository +*/ + +'use strict'; + +var obsidian = require('obsidian'); + +/*! ***************************************************************************** +Copyright (c) Microsoft Corporation. + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. +***************************************************************************** */ + +function __awaiter(thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +} + +const pluginName = 'Drag and Drop Blocks'; +const DEFAULT_SETTINGS = { + mySetting: 'default' +}; +class MyPlugin extends obsidian.Plugin { + onload() { + return __awaiter(this, void 0, void 0, function* () { + console.log("loading plugin: " + pluginName); + this.blockRefStartLine = null; + this.blockRefEmbed = null; + this.blockRefNewLine = null; + this.originalText = null; + this.blockRefDragState = null; + this.blockRefStartLeaf = null; + this.blockRefClientY = null; + this.blockRefModDrop = { alt: null, ctrl: null, shift: null }; + this.blockRefModDrag = { alt: null, ctrl: null, shift: null }; + yield this.loadSettings(); + this.addSettingTab(new SampleSettingTab(this.app, this)); + this.app.workspace.onLayoutReady(this.onLayoutReady.bind(this)); + }); + } + onLayoutReady() { + //Find the main DIV that holds all the markdown panes + const actDoc = document.getElementsByClassName('workspace-split mod-vertical mod-root')[0]; + this.registerDomEvent(actDoc, 'mouseover', (evt) => { + const mainDiv = evt.target; + if (mainDiv.className === 'CodeMirror-linenumber CodeMirror-gutter-elt') { + let oldElem = document.getElementById('block-ref-hover'); + if (oldElem) { + oldElem.remove(); + } + let docBody = document.getElementsByTagName('body')[0]; + const newElement = document.createElement("div"); + newElement.id = 'block-ref-hover'; + docBody.insertBefore(newElement, null); + newElement.draggable = true; + //newElement.innerText = "◎"; + //newElement.innerText = "❖"; + //newElement.style.fontSize = "12px"; + newElement.innerText = "⋮⋮"; + newElement.style.fontSize = "16px"; + newElement.style.fontWeight = "bold"; + newElement.style.color = "var(--text-accent-hover)"; + //newElement.style.cursor = "grab"; + newElement.style.cursor = "move"; + newElement.style.position = "absolute"; + let targetRect = mainDiv.getBoundingClientRect(); + newElement.style.top = `${targetRect.top - 1}px`; + newElement.style.left = `${targetRect.left - 8}px`; + this.registerDomEvent(newElement, 'mouseover', (evt) => { + const eventDiv = evt.target; + eventDiv.style.color = "var(--text-accent-hover)"; + }); + this.registerDomEvent(newElement, 'mouseout', (evt) => { + const eventDiv = evt.target; + eventDiv.style.color = "transparent"; + }); + this.registerDomEvent(mainDiv, 'mouseout', (evt) => { + const oldElem = document.getElementById('block-ref-hover'); + if (oldElem) { + oldElem.style.color = "transparent"; + } + }); + //Find the leaf that is being hovered over + let leafEl = this.app.workspace.containerEl.find(".workspace-leaf:hover"); + let allLeaves = this.app.workspace.getLeavesOfType("markdown"); + let hoveredLeaf = allLeaves.find(eachLeaf => eachLeaf.containerEl == leafEl); + if (hoveredLeaf) { + this.blockRefStartLeaf = hoveredLeaf; + this.blockRefClientY = evt.clientY + 1; + } + this.registerDomEvent(newElement, 'dragstart', (evt) => { + let hoveredLeaf = this.blockRefStartLeaf; + let mdView; + if (hoveredLeaf) { + mdView = hoveredLeaf.view; + } + if (mdView) { + this.blockRefModDrag = { alt: evt.altKey, ctrl: (evt.ctrlKey || evt.metaKey), shift: evt.shiftKey }; + let mdEditor = mdView.editor; + let topPos = this.blockRefClientY; + //NOTE: mdEditor.posAtCoords(x, y) is equivalent to mdEditor.cm.coordsChar({ left: x, top: y }) + let thisLine = mdEditor.posAtCoords(0, topPos).line; + //mdEditor.setSelection({ line: thisLine, ch: 0 }, { line: thisLine, ch: 9999 }); + let lineContent = mdEditor.getLine(thisLine); + let blockid = ''; + let finalString = ''; + let block = ''; + //No modifier keys held so move the block to the new location + if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && !this.blockRefModDrag.shift) { + evt.dataTransfer.setData("text/plain", lineContent); + } + //Shift key held so copy the block to the new location + if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && this.blockRefModDrag.shift) { + evt.dataTransfer.setData("text/plain", lineContent); + } + //Alt key held to create a block reference (CMD/Ctrl is not working for MACs so going with Alt) + if (this.blockRefModDrag.alt && !this.blockRefModDrag.ctrl && !this.blockRefModDrag.shift) { + const blockRef = lineContent.match(/ \^(.*)/); + if (blockRef) { + blockid = blockRef[1]; + finalString = lineContent; + } + else { + let characters = 'abcdefghijklmnopqrstuvwxyz0123456789'; + let charactersLength = characters.length; + for (var i = 0; i < 7; i++) { + blockid += characters.charAt(Math.floor(Math.random() * charactersLength)); + } + finalString = lineContent + ` ^${blockid}`; + } + block = `![` + `[${mdView.file.basename}#^${blockid}]]`.split("\n").join(""); + evt.dataTransfer.setData("text/plain", block); + } + this.blockRefStartLine = thisLine; + this.blockRefEmbed = block; + this.blockRefNewLine = finalString; + this.originalText = lineContent; + this.blockRefDragState = 'start'; + } + }); + this.registerDomEvent(newElement, 'dragend', (evt) => { + if (this.blockRefDragState === "dropped") { + //this.app.workspace.setActiveLeaf(this.blockRefStartLeaf); + let mdView; + if (this.blockRefStartLeaf) { + mdView = this.blockRefStartLeaf.view; + } + if (mdView) { + let mdEditor = mdView.editor; + //No modifier keys held so move the block to the new location + if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && !this.blockRefModDrag.shift) { + //Delete the original line you dragged + mdEditor.setLine(this.blockRefStartLine, ''); + } + //Shift key held so copy the block to the new location + if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && this.blockRefModDrag.shift) ; + //Alt key held to create a block reference (CMD/Ctrl is not working for MACs so going with Alt) + if (this.blockRefModDrag.alt && !this.blockRefModDrag.ctrl && !this.blockRefModDrag.shift) { + mdEditor.setLine(this.blockRefStartLine, this.blockRefNewLine); + mdEditor.setSelection({ line: this.blockRefStartLine, ch: 0 }, { line: this.blockRefStartLine, ch: 9999 }); + } + } + } + if (this.blockRefDragState === 'cancelled') ; + let oldElem = document.getElementById('block-ref-hover'); + if (oldElem) { + oldElem.remove(); + } + this.blockRefStartLine = null; + this.blockRefEmbed = null; + this.blockRefNewLine = null; + this.originalText = null; + this.blockRefDragState = null; + this.blockRefStartLeaf = null; + this.blockRefClientY = null; + this.blockRefModDrop = { alt: null, ctrl: null, shift: null }; + this.blockRefModDrag = { alt: null, ctrl: null, shift: null }; + }); + } + if (evt.ctrlKey && evt.shiftKey) { + let leafEl = this.app.workspace.containerEl.find(".workspace-leaf:hover"); + let allLeaves = this.app.workspace.getLeavesOfType("markdown"); + let hoveredLeaf = allLeaves.find(eachLeaf => eachLeaf.containerEl == leafEl); + let mdView; + if (hoveredLeaf) { + mdView = hoveredLeaf.view; + } + if (mdView) { + let mdEditor = mdView.editor; + let topPos = evt.clientY + 1; + //NOTE: mdEditor.posAtCoords(x, y) is equivalent to mdEditor.cm.coordsChar({ left: x, top: y }) + let thisLine = mdEditor.posAtCoords(0, topPos).line; + mdEditor.setSelection({ line: thisLine, ch: 0 }, { line: thisLine, ch: 9999 }); + } + } + }); + this.registerDomEvent(actDoc, 'drop', (evt) => { + if (this.blockRefDragState === 'start') { + this.blockRefDragState = 'dropped'; + this.blockRefModDrop = { alt: evt.altKey, ctrl: (evt.ctrlKey || evt.metaKey), shift: evt.shiftKey }; + } + }); + } + onunload() { + let oldElem = document.getElementById('block-ref-hover'); + if (oldElem) { + oldElem.remove(); + } + console.log("Unloading plugin: " + pluginName); + } + loadSettings() { + return __awaiter(this, void 0, void 0, function* () { + this.settings = Object.assign({}, DEFAULT_SETTINGS, yield this.loadData()); + }); + } + saveSettings() { + return __awaiter(this, void 0, void 0, function* () { + yield this.saveData(this.settings); + }); + } +} +class SampleSettingTab extends obsidian.PluginSettingTab { + constructor(app, plugin) { + super(app, plugin); + this.plugin = plugin; + } + display() { + let { containerEl } = this; + containerEl.empty(); + containerEl.createEl('h2', { text: 'Drag and Drop Block Settings' }); + new obsidian.Setting(containerEl) + .setName('Setting 1') + .setDesc('This is a placeholder only and doesn\'t do anything at this point') + .addText(text => text + .setPlaceholder('N/A') + .setValue('') + .onChange((value) => __awaiter(this, void 0, void 0, function* () { + this.plugin.settings.mySetting = value; + yield this.plugin.saveSettings(); + }))); + } +} + +module.exports = MyPlugin; +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"main.js","sources":["node_modules/tslib/tslib.es6.js","main.ts"],"sourcesContent":null,"names":["Plugin","PluginSettingTab","Setting"],"mappings":"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"} diff --git a/package.json b/package.json index 29e2406..590496c 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,18 @@ { - "name": "obsidian-sample-plugin", + "name": "obsidian-drag-and-drop-blocks", "version": "0.12.0", - "description": "This is a sample plugin for Obsidian (https://obsidian.md)", + "description": "Drag and Drop Blocks", "main": "main.js", "scripts": { - "dev": "rollup --config rollup.config.js -w", - "build": "rollup --config rollup.config.js --environment BUILD:production" + "dev": "esbuild src/main.ts --bundle --external:obsidian --format=cjs --outfile=build/main.js --watch", + "build": "esbuild src/main.ts --bundle --external:obsidian --format=cjs --outfile=build/main.js" }, "keywords": [], "author": "", "license": "MIT", "devDependencies": { - "@rollup/plugin-commonjs": "^18.0.0", - "@rollup/plugin-node-resolve": "^11.2.1", - "@rollup/plugin-typescript": "^8.2.1", "@types/node": "^14.14.37", "obsidian": "^0.12.0", - "rollup": "^2.32.1", "tslib": "^2.2.0", "typescript": "^4.2.4" } diff --git a/rollup.config.js b/rollup.config.js deleted file mode 100644 index dd4d041..0000000 --- a/rollup.config.js +++ /dev/null @@ -1,30 +0,0 @@ -import typescript from '@rollup/plugin-typescript'; -import {nodeResolve} from '@rollup/plugin-node-resolve'; -import commonjs from '@rollup/plugin-commonjs'; - -const isProd = (process.env.BUILD === 'production'); - -const banner = -`/* -THIS IS A GENERATED/BUNDLED FILE BY ROLLUP -if you want to view the source visit the plugins github repository -*/ -`; - -export default { - input: 'main.ts', - output: { - dir: '.', - sourcemap: 'inline', - sourcemapExcludeSources: isProd, - format: 'cjs', - exports: 'default', - banner, - }, - external: ['obsidian'], - plugins: [ - typescript(), - nodeResolve({browser: true}), - commonjs(), - ] -}; \ No newline at end of file diff --git a/main.ts b/src/main.ts similarity index 97% rename from main.ts rename to src/main.ts index 3465773..96fcda7 100644 --- a/main.ts +++ b/src/main.ts @@ -1,279 +1,279 @@ -import { App, Modal, Notice, Plugin, PluginSettingTab, Setting, TFile, WorkspaceLeaf, MarkdownView, Editor } from 'obsidian'; -declare module "obsidian" { - interface WorkspaceLeaf { - containerEl: HTMLElement; - } - interface Editor { - posAtCoords(left: number, top: number): EditorPosition; - } -} -const pluginName = 'Drag and Drop Blocks'; - -interface MyPluginSettings { - mySetting: string; -} - -const DEFAULT_SETTINGS: MyPluginSettings = { - mySetting: 'default' -} - -export default class MyPlugin extends Plugin { - settings: MyPluginSettings; - - //My variables - blockRefStartLine: number; - blockRefEmbed: string; - blockRefNewLine: string; - originalText: string; - blockRefDragState: string; - blockRefStartLeaf: WorkspaceLeaf; - blockRefClientY: number; - blockRefModDrag: { - alt: boolean, - ctrl: boolean, - shift: boolean - } - blockRefModDrop: { - alt: boolean, - ctrl: boolean, - shift: boolean - } - - async onload() { - console.log("loading plugin: " + pluginName); - - this.blockRefStartLine = null; - this.blockRefEmbed = null; - this.blockRefNewLine = null; - this.originalText = null; - this.blockRefDragState = null; - this.blockRefStartLeaf = null; - this.blockRefClientY = null; - this.blockRefModDrop = { alt: null, ctrl: null, shift: null } - this.blockRefModDrag = { alt: null, ctrl: null, shift: null } - - await this.loadSettings(); - - this.addSettingTab(new SampleSettingTab(this.app, this)); - - this.app.workspace.onLayoutReady(this.onLayoutReady.bind(this)); - } - - onLayoutReady(): void { - //Find the main DIV that holds all the markdown panes - const actDoc: HTMLElement = document.getElementsByClassName('workspace-split mod-vertical mod-root')[0] as HTMLElement; - - this.registerDomEvent(actDoc, 'mouseover', (evt: MouseEvent) => { - const mainDiv: HTMLElement = evt.target as HTMLElement; - if (mainDiv.className === 'CodeMirror-linenumber CodeMirror-gutter-elt') { - let oldElem: HTMLElement = document.getElementById('block-ref-hover'); - if (oldElem) { oldElem.remove() } - let docBody: HTMLBodyElement = document.getElementsByTagName('body')[0]; - const newElement: HTMLDivElement = document.createElement("div"); - newElement.id = 'block-ref-hover'; - docBody.insertBefore(newElement, null); - newElement.draggable = true; - //newElement.innerText = "◎"; - //newElement.innerText = "❖"; - //newElement.style.fontSize = "12px"; - newElement.innerText = "⋮⋮"; - newElement.style.fontSize = "16px"; - newElement.style.fontWeight = "bold"; - newElement.style.color = "var(--text-accent-hover)"; - //newElement.style.cursor = "grab"; - newElement.style.cursor = "move"; - newElement.style.position = "absolute"; - let targetRect = mainDiv.getBoundingClientRect(); - newElement.style.top = `${targetRect.top - 1}px`; - newElement.style.left = `${targetRect.left - 8}px`; - - this.registerDomEvent(newElement, 'mouseover', (evt: MouseEvent) => { - const eventDiv: HTMLElement = evt.target as HTMLElement; - eventDiv.style.color = "var(--text-accent-hover)"; - }) - - this.registerDomEvent(newElement, 'mouseout', (evt: MouseEvent) => { - const eventDiv: HTMLElement = evt.target as HTMLElement; - eventDiv.style.color = "transparent"; - }) - - this.registerDomEvent(mainDiv, 'mouseout', (evt: MouseEvent) => { - const oldElem: HTMLElement = document.getElementById('block-ref-hover'); - if (oldElem) { oldElem.style.color = "transparent"; } - }) - - //Find the leaf that is being hovered over - let leafEl = this.app.workspace.containerEl.find(".workspace-leaf:hover"); - let allLeaves: Array = this.app.workspace.getLeavesOfType("markdown"); - let hoveredLeaf: WorkspaceLeaf = allLeaves.find(eachLeaf => eachLeaf.containerEl == leafEl); - if (hoveredLeaf) { - this.blockRefStartLeaf = hoveredLeaf; - this.blockRefClientY = evt.clientY + 1; - } - - this.registerDomEvent(newElement, 'dragstart', (evt: DragEvent) => { - let hoveredLeaf: WorkspaceLeaf = this.blockRefStartLeaf; - let mdView: MarkdownView; - if (hoveredLeaf) { mdView = hoveredLeaf.view as MarkdownView; } - if (mdView) { - this.blockRefModDrag = { alt: evt.altKey, ctrl: (evt.ctrlKey || evt.metaKey), shift: evt.shiftKey } - let mdEditor: Editor = mdView.editor; - let topPos: number = this.blockRefClientY; - //NOTE: mdEditor.posAtCoords(x, y) is equivalent to mdEditor.cm.coordsChar({ left: x, top: y }) - let thisLine: number = mdEditor.posAtCoords(0, topPos).line; - //mdEditor.setSelection({ line: thisLine, ch: 0 }, { line: thisLine, ch: 9999 }); - let lineContent: string = mdEditor.getLine(thisLine); - - let blockid: string = ''; - let finalString: string = ''; - let block: string = ''; - - //No modifier keys held so move the block to the new location - if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && !this.blockRefModDrag.shift) { - evt.dataTransfer.setData("text/plain", lineContent); - } - - //Shift key held so copy the block to the new location - if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && this.blockRefModDrag.shift) { - evt.dataTransfer.setData("text/plain", lineContent); - } - - //Alt key held to create a block reference (CMD/Ctrl is not working for MACs so going with Alt) - if (this.blockRefModDrag.alt && !this.blockRefModDrag.ctrl && !this.blockRefModDrag.shift) { - const blockRef: RegExpMatchArray = lineContent.match(/ \^(.*)/); - if (blockRef) { - blockid = blockRef[1]; - finalString = lineContent; - } else { - let characters: string = 'abcdefghijklmnopqrstuvwxyz0123456789'; - let charactersLength: number = characters.length; - for (var i = 0; i < 7; i++) { - blockid += characters.charAt(Math.floor(Math.random() * charactersLength)); - } - finalString = lineContent + ` ^${blockid}`; - } - - block = `![` + `[${mdView.file.basename}#^${blockid}]]`.split("\n").join(""); - evt.dataTransfer.setData("text/plain", block); - } - - this.blockRefStartLine = thisLine; - this.blockRefEmbed = block; - this.blockRefNewLine = finalString; - this.originalText = lineContent; - this.blockRefDragState = 'start'; - } - }) - - this.registerDomEvent(newElement, 'dragend', (evt: DragEvent) => { - if (this.blockRefDragState === "dropped") { - //this.app.workspace.setActiveLeaf(this.blockRefStartLeaf); - let mdView: MarkdownView; - if (this.blockRefStartLeaf) { mdView = this.blockRefStartLeaf.view as MarkdownView; } - if (mdView) { - let mdEditor: Editor = mdView.editor; - - //No modifier keys held so move the block to the new location - if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && !this.blockRefModDrag.shift) { - //Delete the original line you dragged - mdEditor.setLine(this.blockRefStartLine, ''); - } - - //Shift key held so copy the block to the new location - if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && this.blockRefModDrag.shift) { - //Do not have to do anything to the original block you dragged because it is just a copy / duplicate command - } - - //Alt key held to create a block reference (CMD/Ctrl is not working for MACs so going with Alt) - if (this.blockRefModDrag.alt && !this.blockRefModDrag.ctrl && !this.blockRefModDrag.shift) { - mdEditor.setLine(this.blockRefStartLine, this.blockRefNewLine); - mdEditor.setSelection({ line: this.blockRefStartLine, ch: 0 }, { line: this.blockRefStartLine, ch: 9999 }); - } - } - } - - if (this.blockRefDragState === 'cancelled') { - //Nothing right now - } - - let oldElem = document.getElementById('block-ref-hover'); - if (oldElem) { oldElem.remove() } - this.blockRefStartLine = null; - this.blockRefEmbed = null; - this.blockRefNewLine = null; - this.originalText = null; - this.blockRefDragState = null; - this.blockRefStartLeaf = null; - this.blockRefClientY = null; - this.blockRefModDrop = { alt: null, ctrl: null, shift: null } - this.blockRefModDrag = { alt: null, ctrl: null, shift: null } - }) - } - - if (evt.ctrlKey && evt.shiftKey) { - let leafEl = this.app.workspace.containerEl.find(".workspace-leaf:hover"); - - let allLeaves: Array = this.app.workspace.getLeavesOfType("markdown"); - let hoveredLeaf: WorkspaceLeaf = allLeaves.find(eachLeaf => eachLeaf.containerEl == leafEl); - let mdView: MarkdownView; - if (hoveredLeaf) { mdView = hoveredLeaf.view as MarkdownView; } - if (mdView) { - let mdEditor: Editor = mdView.editor; - let topPos: number = evt.clientY + 1; - //NOTE: mdEditor.posAtCoords(x, y) is equivalent to mdEditor.cm.coordsChar({ left: x, top: y }) - let thisLine: number = mdEditor.posAtCoords(0, topPos).line; - mdEditor.setSelection({ line: thisLine, ch: 0 }, { line: thisLine, ch: 9999 }); - } - } - }); - - this.registerDomEvent(actDoc, 'drop', (evt: DragEvent) => { - if (this.blockRefDragState === 'start') { - this.blockRefDragState = 'dropped'; - this.blockRefModDrop = { alt: evt.altKey, ctrl: (evt.ctrlKey || evt.metaKey), shift: evt.shiftKey } - } - }) - } - - onunload() { - let oldElem = document.getElementById('block-ref-hover'); - if (oldElem) { oldElem.remove() } - console.log("Unloading plugin: " + pluginName); - } - - async loadSettings() { - this.settings = Object.assign({}, DEFAULT_SETTINGS, await this.loadData()); - } - - async saveSettings() { - await this.saveData(this.settings); - } -} - -class SampleSettingTab extends PluginSettingTab { - plugin: MyPlugin; - - constructor(app: App, plugin: MyPlugin) { - super(app, plugin); - this.plugin = plugin; - } - - display(): void { - let {containerEl} = this; - - containerEl.empty(); - - containerEl.createEl('h2', { text: 'Drag and Drop Block Settings' }); - - new Setting(containerEl) - .setName('Setting 1') - .setDesc('This is a placeholder only and doesn\'t do anything at this point') - .addText(text => text - .setPlaceholder('N/A') - .setValue('') - .onChange(async (value) => { - this.plugin.settings.mySetting = value; - await this.plugin.saveSettings(); - })); - } -} +import { App, Modal, Notice, Plugin, PluginSettingTab, Setting, TFile, WorkspaceLeaf, MarkdownView, Editor } from 'obsidian'; +declare module "obsidian" { + interface WorkspaceLeaf { + containerEl: HTMLElement; + } + interface Editor { + posAtCoords(left: number, top: number): EditorPosition; + } +} +const pluginName = 'Drag and Drop Blocks'; + +interface MyPluginSettings { + mySetting: string; +} + +const DEFAULT_SETTINGS: MyPluginSettings = { + mySetting: 'default' +} + +export default class MyPlugin extends Plugin { + settings: MyPluginSettings; + + //My variables + blockRefStartLine: number; + blockRefEmbed: string; + blockRefNewLine: string; + originalText: string; + blockRefDragState: string; + blockRefStartLeaf: WorkspaceLeaf; + blockRefClientY: number; + blockRefModDrag: { + alt: boolean, + ctrl: boolean, + shift: boolean + } + blockRefModDrop: { + alt: boolean, + ctrl: boolean, + shift: boolean + } + + async onload() { + console.log("loading plugin: " + pluginName); + + this.blockRefStartLine = null; + this.blockRefEmbed = null; + this.blockRefNewLine = null; + this.originalText = null; + this.blockRefDragState = null; + this.blockRefStartLeaf = null; + this.blockRefClientY = null; + this.blockRefModDrop = { alt: null, ctrl: null, shift: null } + this.blockRefModDrag = { alt: null, ctrl: null, shift: null } + + await this.loadSettings(); + + this.addSettingTab(new SampleSettingTab(this.app, this)); + + this.app.workspace.onLayoutReady(this.onLayoutReady.bind(this)); + } + + onLayoutReady(): void { + //Find the main DIV that holds all the markdown panes + const actDoc: HTMLElement = document.getElementsByClassName('workspace-split mod-vertical mod-root')[0] as HTMLElement; + + this.registerDomEvent(actDoc, 'mouseover', (evt: MouseEvent) => { + const mainDiv: HTMLElement = evt.target as HTMLElement; + if (mainDiv.className === 'CodeMirror-linenumber CodeMirror-gutter-elt') { + let oldElem: HTMLElement = document.getElementById('block-ref-hover'); + if (oldElem) { oldElem.remove() } + let docBody: HTMLBodyElement = document.getElementsByTagName('body')[0]; + const newElement: HTMLDivElement = document.createElement("div"); + newElement.id = 'block-ref-hover'; + docBody.insertBefore(newElement, null); + newElement.draggable = true; + //newElement.innerText = "◎"; + //newElement.innerText = "❖"; + //newElement.style.fontSize = "12px"; + newElement.innerText = "⋮⋮"; + newElement.style.fontSize = "16px"; + newElement.style.fontWeight = "bold"; + newElement.style.color = "var(--text-accent-hover)"; + //newElement.style.cursor = "grab"; + newElement.style.cursor = "move"; + newElement.style.position = "absolute"; + let targetRect = mainDiv.getBoundingClientRect(); + newElement.style.top = `${targetRect.top - 1}px`; + newElement.style.left = `${targetRect.left - 8}px`; + + this.registerDomEvent(newElement, 'mouseover', (evt: MouseEvent) => { + const eventDiv: HTMLElement = evt.target as HTMLElement; + eventDiv.style.color = "var(--text-accent-hover)"; + }) + + this.registerDomEvent(newElement, 'mouseout', (evt: MouseEvent) => { + const eventDiv: HTMLElement = evt.target as HTMLElement; + eventDiv.style.color = "transparent"; + }) + + this.registerDomEvent(mainDiv, 'mouseout', (evt: MouseEvent) => { + const oldElem: HTMLElement = document.getElementById('block-ref-hover'); + if (oldElem) { oldElem.style.color = "transparent"; } + }) + + //Find the leaf that is being hovered over + let leafEl = this.app.workspace.containerEl.find(".workspace-leaf:hover"); + let allLeaves: Array = this.app.workspace.getLeavesOfType("markdown"); + let hoveredLeaf: WorkspaceLeaf = allLeaves.find(eachLeaf => eachLeaf.containerEl == leafEl); + if (hoveredLeaf) { + this.blockRefStartLeaf = hoveredLeaf; + this.blockRefClientY = evt.clientY + 1; + } + + this.registerDomEvent(newElement, 'dragstart', (evt: DragEvent) => { + let hoveredLeaf: WorkspaceLeaf = this.blockRefStartLeaf; + let mdView: MarkdownView; + if (hoveredLeaf) { mdView = hoveredLeaf.view as MarkdownView; } + if (mdView) { + this.blockRefModDrag = { alt: evt.altKey, ctrl: (evt.ctrlKey || evt.metaKey), shift: evt.shiftKey } + let mdEditor: Editor = mdView.editor; + let topPos: number = this.blockRefClientY; + //NOTE: mdEditor.posAtCoords(x, y) is equivalent to mdEditor.cm.coordsChar({ left: x, top: y }) + let thisLine: number = mdEditor.posAtCoords(0, topPos).line; + //mdEditor.setSelection({ line: thisLine, ch: 0 }, { line: thisLine, ch: 9999 }); + let lineContent: string = mdEditor.getLine(thisLine); + + let blockid: string = ''; + let finalString: string = ''; + let block: string = ''; + + //No modifier keys held so move the block to the new location + if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && !this.blockRefModDrag.shift) { + evt.dataTransfer.setData("text/plain", lineContent); + } + + //Shift key held so copy the block to the new location + if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && this.blockRefModDrag.shift) { + evt.dataTransfer.setData("text/plain", lineContent); + } + + //Alt key held to create a block reference (CMD/Ctrl is not working for MACs so going with Alt) + if (this.blockRefModDrag.alt && !this.blockRefModDrag.ctrl && !this.blockRefModDrag.shift) { + const blockRef: RegExpMatchArray = lineContent.match(/ \^(.*)/); + if (blockRef) { + blockid = blockRef[1]; + finalString = lineContent; + } else { + let characters: string = 'abcdefghijklmnopqrstuvwxyz0123456789'; + let charactersLength: number = characters.length; + for (var i = 0; i < 7; i++) { + blockid += characters.charAt(Math.floor(Math.random() * charactersLength)); + } + finalString = lineContent + ` ^${blockid}`; + } + + block = `![` + `[${mdView.file.basename}#^${blockid}]]`.split("\n").join(""); + evt.dataTransfer.setData("text/plain", block); + } + + this.blockRefStartLine = thisLine; + this.blockRefEmbed = block; + this.blockRefNewLine = finalString; + this.originalText = lineContent; + this.blockRefDragState = 'start'; + } + }) + + this.registerDomEvent(newElement, 'dragend', (evt: DragEvent) => { + if (this.blockRefDragState === "dropped") { + //this.app.workspace.setActiveLeaf(this.blockRefStartLeaf); + let mdView: MarkdownView; + if (this.blockRefStartLeaf) { mdView = this.blockRefStartLeaf.view as MarkdownView; } + if (mdView) { + let mdEditor: Editor = mdView.editor; + + //No modifier keys held so move the block to the new location + if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && !this.blockRefModDrag.shift) { + //Delete the original line you dragged + mdEditor.setLine(this.blockRefStartLine, ''); + } + + //Shift key held so copy the block to the new location + if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && this.blockRefModDrag.shift) { + //Do not have to do anything to the original block you dragged because it is just a copy / duplicate command + } + + //Alt key held to create a block reference (CMD/Ctrl is not working for MACs so going with Alt) + if (this.blockRefModDrag.alt && !this.blockRefModDrag.ctrl && !this.blockRefModDrag.shift) { + mdEditor.setLine(this.blockRefStartLine, this.blockRefNewLine); + mdEditor.setSelection({ line: this.blockRefStartLine, ch: 0 }, { line: this.blockRefStartLine, ch: 9999 }); + } + } + } + + if (this.blockRefDragState === 'cancelled') { + //Nothing right now + } + + let oldElem = document.getElementById('block-ref-hover'); + if (oldElem) { oldElem.remove() } + this.blockRefStartLine = null; + this.blockRefEmbed = null; + this.blockRefNewLine = null; + this.originalText = null; + this.blockRefDragState = null; + this.blockRefStartLeaf = null; + this.blockRefClientY = null; + this.blockRefModDrop = { alt: null, ctrl: null, shift: null } + this.blockRefModDrag = { alt: null, ctrl: null, shift: null } + }) + } + + if (evt.ctrlKey && evt.shiftKey) { + let leafEl = this.app.workspace.containerEl.find(".workspace-leaf:hover"); + + let allLeaves: Array = this.app.workspace.getLeavesOfType("markdown"); + let hoveredLeaf: WorkspaceLeaf = allLeaves.find(eachLeaf => eachLeaf.containerEl == leafEl); + let mdView: MarkdownView; + if (hoveredLeaf) { mdView = hoveredLeaf.view as MarkdownView; } + if (mdView) { + let mdEditor: Editor = mdView.editor; + let topPos: number = evt.clientY + 1; + //NOTE: mdEditor.posAtCoords(x, y) is equivalent to mdEditor.cm.coordsChar({ left: x, top: y }) + let thisLine: number = mdEditor.posAtCoords(0, topPos).line; + mdEditor.setSelection({ line: thisLine, ch: 0 }, { line: thisLine, ch: 9999 }); + } + } + }); + + this.registerDomEvent(actDoc, 'drop', (evt: DragEvent) => { + if (this.blockRefDragState === 'start') { + this.blockRefDragState = 'dropped'; + this.blockRefModDrop = { alt: evt.altKey, ctrl: (evt.ctrlKey || evt.metaKey), shift: evt.shiftKey } + } + }) + } + + onunload() { + let oldElem = document.getElementById('block-ref-hover'); + if (oldElem) { oldElem.remove() } + console.log("Unloading plugin: " + pluginName); + } + + async loadSettings() { + this.settings = Object.assign({}, DEFAULT_SETTINGS, await this.loadData()); + } + + async saveSettings() { + await this.saveData(this.settings); + } +} + +class SampleSettingTab extends PluginSettingTab { + plugin: MyPlugin; + + constructor(app: App, plugin: MyPlugin) { + super(app, plugin); + this.plugin = plugin; + } + + display(): void { + let {containerEl} = this; + + containerEl.empty(); + + containerEl.createEl('h2', { text: 'Drag and Drop Block Settings' }); + + new Setting(containerEl) + .setName('Setting 1') + .setDesc('This is a placeholder only and doesn\'t do anything at this point') + .addText(text => text + .setPlaceholder('N/A') + .setValue('') + .onChange(async (value) => { + this.plugin.settings.mySetting = value; + await this.plugin.saveSettings(); + })); + } +} From e718eb9f0f7cb3063d574bae9017920468b43d94 Mon Sep 17 00:00:00 2001 From: CK <69121180+TfTHacker@users.noreply.github.com> Date: Fri, 27 Aug 2021 06:59:16 +0200 Subject: [PATCH 2/2] Delete main.js --- main.js | 261 -------------------------------------------------------- 1 file changed, 261 deletions(-) delete mode 100644 main.js diff --git a/main.js b/main.js deleted file mode 100644 index 1c40e20..0000000 --- a/main.js +++ /dev/null @@ -1,261 +0,0 @@ -/* -THIS IS A GENERATED/BUNDLED FILE BY ROLLUP -if you want to view the source visit the plugins github repository -*/ - -'use strict'; - -var obsidian = require('obsidian'); - -/*! ***************************************************************************** -Copyright (c) Microsoft Corporation. - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. -***************************************************************************** */ - -function __awaiter(thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -} - -const pluginName = 'Drag and Drop Blocks'; -const DEFAULT_SETTINGS = { - mySetting: 'default' -}; -class MyPlugin extends obsidian.Plugin { - onload() { - return __awaiter(this, void 0, void 0, function* () { - console.log("loading plugin: " + pluginName); - this.blockRefStartLine = null; - this.blockRefEmbed = null; - this.blockRefNewLine = null; - this.originalText = null; - this.blockRefDragState = null; - this.blockRefStartLeaf = null; - this.blockRefClientY = null; - this.blockRefModDrop = { alt: null, ctrl: null, shift: null }; - this.blockRefModDrag = { alt: null, ctrl: null, shift: null }; - yield this.loadSettings(); - this.addSettingTab(new SampleSettingTab(this.app, this)); - this.app.workspace.onLayoutReady(this.onLayoutReady.bind(this)); - }); - } - onLayoutReady() { - //Find the main DIV that holds all the markdown panes - const actDoc = document.getElementsByClassName('workspace-split mod-vertical mod-root')[0]; - this.registerDomEvent(actDoc, 'mouseover', (evt) => { - const mainDiv = evt.target; - if (mainDiv.className === 'CodeMirror-linenumber CodeMirror-gutter-elt') { - let oldElem = document.getElementById('block-ref-hover'); - if (oldElem) { - oldElem.remove(); - } - let docBody = document.getElementsByTagName('body')[0]; - const newElement = document.createElement("div"); - newElement.id = 'block-ref-hover'; - docBody.insertBefore(newElement, null); - newElement.draggable = true; - //newElement.innerText = "◎"; - //newElement.innerText = "❖"; - //newElement.style.fontSize = "12px"; - newElement.innerText = "⋮⋮"; - newElement.style.fontSize = "16px"; - newElement.style.fontWeight = "bold"; - newElement.style.color = "var(--text-accent-hover)"; - //newElement.style.cursor = "grab"; - newElement.style.cursor = "move"; - newElement.style.position = "absolute"; - let targetRect = mainDiv.getBoundingClientRect(); - newElement.style.top = `${targetRect.top - 1}px`; - newElement.style.left = `${targetRect.left - 8}px`; - this.registerDomEvent(newElement, 'mouseover', (evt) => { - const eventDiv = evt.target; - eventDiv.style.color = "var(--text-accent-hover)"; - }); - this.registerDomEvent(newElement, 'mouseout', (evt) => { - const eventDiv = evt.target; - eventDiv.style.color = "transparent"; - }); - this.registerDomEvent(mainDiv, 'mouseout', (evt) => { - const oldElem = document.getElementById('block-ref-hover'); - if (oldElem) { - oldElem.style.color = "transparent"; - } - }); - //Find the leaf that is being hovered over - let leafEl = this.app.workspace.containerEl.find(".workspace-leaf:hover"); - let allLeaves = this.app.workspace.getLeavesOfType("markdown"); - let hoveredLeaf = allLeaves.find(eachLeaf => eachLeaf.containerEl == leafEl); - if (hoveredLeaf) { - this.blockRefStartLeaf = hoveredLeaf; - this.blockRefClientY = evt.clientY + 1; - } - this.registerDomEvent(newElement, 'dragstart', (evt) => { - let hoveredLeaf = this.blockRefStartLeaf; - let mdView; - if (hoveredLeaf) { - mdView = hoveredLeaf.view; - } - if (mdView) { - this.blockRefModDrag = { alt: evt.altKey, ctrl: (evt.ctrlKey || evt.metaKey), shift: evt.shiftKey }; - let mdEditor = mdView.editor; - let topPos = this.blockRefClientY; - //NOTE: mdEditor.posAtCoords(x, y) is equivalent to mdEditor.cm.coordsChar({ left: x, top: y }) - let thisLine = mdEditor.posAtCoords(0, topPos).line; - //mdEditor.setSelection({ line: thisLine, ch: 0 }, { line: thisLine, ch: 9999 }); - let lineContent = mdEditor.getLine(thisLine); - let blockid = ''; - let finalString = ''; - let block = ''; - //No modifier keys held so move the block to the new location - if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && !this.blockRefModDrag.shift) { - evt.dataTransfer.setData("text/plain", lineContent); - } - //Shift key held so copy the block to the new location - if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && this.blockRefModDrag.shift) { - evt.dataTransfer.setData("text/plain", lineContent); - } - //Alt key held to create a block reference (CMD/Ctrl is not working for MACs so going with Alt) - if (this.blockRefModDrag.alt && !this.blockRefModDrag.ctrl && !this.blockRefModDrag.shift) { - const blockRef = lineContent.match(/ \^(.*)/); - if (blockRef) { - blockid = blockRef[1]; - finalString = lineContent; - } - else { - let characters = 'abcdefghijklmnopqrstuvwxyz0123456789'; - let charactersLength = characters.length; - for (var i = 0; i < 7; i++) { - blockid += characters.charAt(Math.floor(Math.random() * charactersLength)); - } - finalString = lineContent + ` ^${blockid}`; - } - block = `![` + `[${mdView.file.basename}#^${blockid}]]`.split("\n").join(""); - evt.dataTransfer.setData("text/plain", block); - } - this.blockRefStartLine = thisLine; - this.blockRefEmbed = block; - this.blockRefNewLine = finalString; - this.originalText = lineContent; - this.blockRefDragState = 'start'; - } - }); - this.registerDomEvent(newElement, 'dragend', (evt) => { - if (this.blockRefDragState === "dropped") { - //this.app.workspace.setActiveLeaf(this.blockRefStartLeaf); - let mdView; - if (this.blockRefStartLeaf) { - mdView = this.blockRefStartLeaf.view; - } - if (mdView) { - let mdEditor = mdView.editor; - //No modifier keys held so move the block to the new location - if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && !this.blockRefModDrag.shift) { - //Delete the original line you dragged - mdEditor.setLine(this.blockRefStartLine, ''); - } - //Shift key held so copy the block to the new location - if (!this.blockRefModDrag.ctrl && !this.blockRefModDrag.alt && this.blockRefModDrag.shift) ; - //Alt key held to create a block reference (CMD/Ctrl is not working for MACs so going with Alt) - if (this.blockRefModDrag.alt && !this.blockRefModDrag.ctrl && !this.blockRefModDrag.shift) { - mdEditor.setLine(this.blockRefStartLine, this.blockRefNewLine); - mdEditor.setSelection({ line: this.blockRefStartLine, ch: 0 }, { line: this.blockRefStartLine, ch: 9999 }); - } - } - } - if (this.blockRefDragState === 'cancelled') ; - let oldElem = document.getElementById('block-ref-hover'); - if (oldElem) { - oldElem.remove(); - } - this.blockRefStartLine = null; - this.blockRefEmbed = null; - this.blockRefNewLine = null; - this.originalText = null; - this.blockRefDragState = null; - this.blockRefStartLeaf = null; - this.blockRefClientY = null; - this.blockRefModDrop = { alt: null, ctrl: null, shift: null }; - this.blockRefModDrag = { alt: null, ctrl: null, shift: null }; - }); - } - if (evt.ctrlKey && evt.shiftKey) { - let leafEl = this.app.workspace.containerEl.find(".workspace-leaf:hover"); - let allLeaves = this.app.workspace.getLeavesOfType("markdown"); - let hoveredLeaf = allLeaves.find(eachLeaf => eachLeaf.containerEl == leafEl); - let mdView; - if (hoveredLeaf) { - mdView = hoveredLeaf.view; - } - if (mdView) { - let mdEditor = mdView.editor; - let topPos = evt.clientY + 1; - //NOTE: mdEditor.posAtCoords(x, y) is equivalent to mdEditor.cm.coordsChar({ left: x, top: y }) - let thisLine = mdEditor.posAtCoords(0, topPos).line; - mdEditor.setSelection({ line: thisLine, ch: 0 }, { line: thisLine, ch: 9999 }); - } - } - }); - this.registerDomEvent(actDoc, 'drop', (evt) => { - if (this.blockRefDragState === 'start') { - this.blockRefDragState = 'dropped'; - this.blockRefModDrop = { alt: evt.altKey, ctrl: (evt.ctrlKey || evt.metaKey), shift: evt.shiftKey }; - } - }); - } - onunload() { - let oldElem = document.getElementById('block-ref-hover'); - if (oldElem) { - oldElem.remove(); - } - console.log("Unloading plugin: " + pluginName); - } - loadSettings() { - return __awaiter(this, void 0, void 0, function* () { - this.settings = Object.assign({}, DEFAULT_SETTINGS, yield this.loadData()); - }); - } - saveSettings() { - return __awaiter(this, void 0, void 0, function* () { - yield this.saveData(this.settings); - }); - } -} -class SampleSettingTab extends obsidian.PluginSettingTab { - constructor(app, plugin) { - super(app, plugin); - this.plugin = plugin; - } - display() { - let { containerEl } = this; - containerEl.empty(); - containerEl.createEl('h2', { text: 'Drag and Drop Block Settings' }); - new obsidian.Setting(containerEl) - .setName('Setting 1') - .setDesc('This is a placeholder only and doesn\'t do anything at this point') - .addText(text => text - .setPlaceholder('N/A') - .setValue('') - .onChange((value) => __awaiter(this, void 0, void 0, function* () { - this.plugin.settings.mySetting = value; - yield this.plugin.saveSettings(); - }))); - } -} - -module.exports = MyPlugin; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"main.js","sources":["node_modules/tslib/tslib.es6.js","main.ts"],"sourcesContent":null,"names":["Plugin","PluginSettingTab","Setting"],"mappings":"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"}