feat: drag-and-drop into groups/parent notes + fix ⋯ button styling
Drag-and-drop: - 3-zone drop indicator for groups and parent notes (files with children): top 25% = drop above, middle 50% = drop into, bottom 25% = drop below - 2-zone for regular files/separators/spacers (unchanged) - 'Drop into' shows background highlight instead of border line - Circular reference guard: can't drop a group into itself or descendants ⋯ button: - No visible button chrome when not hovered (no border, no background) - Subtle opacity (0.6) at rest, full opacity on hover - Hover shows text color change only, no background highlight
This commit is contained in:
1 parent
2e8ac7047f
commit
eeb6059fe5
3 files changed
+81
-30
No files matched your search
@@ -2,15 +2,15 @@
|
|||||||
THIS IS A GENERATED/BUNDLED FILE BY ESBUILD
|
THIS IS A GENERATED/BUNDLED FILE BY ESBUILD
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var $=Object.defineProperty;var z=Object.getOwnPropertyDescriptor;var H=Object.getOwnPropertyNames;var _=Object.prototype.hasOwnProperty;var U=(v,p)=>{for(var t in p)$(v,t,{get:p[t],enumerable:!0})},X=(v,p,t,a)=>{if(p&&typeof p=="object"||typeof p=="function")for(let i of H(p))!_.call(v,i)&&i!==t&&$(v,i,{get:()=>p[i],enumerable:!(a=z(p,i))||a.enumerable});return v};var K=v=>X($({},"__esModule",{value:!0}),v);var ee={};U(ee,{default:()=>R});module.exports=K(ee);var u=require("obsidian");var Q={calendar:{firstDayOfWeek:1,showNoteIndicators:!0},daily:{folder:"periodic/daily",templateFile:"Templates/Daily note",nameFormat:"YYYY-MM-DD",typeProperty:"daily-note"},weekly:{folder:"periodic/weekly",templateFile:"Templates/Weekly note",nameFormat:"GGGG-[W]WW",typeProperty:"weekly-note"},monthly:{folder:"periodic/monthly",templateFile:"Templates/Monthly note",nameFormat:"YYYY-MM",typeProperty:"monthly-note"},quarterly:{folder:"periodic/quarterly",templateFile:"Templates/Quarterly note",nameFormat:"YYYY-[Q]Q",typeProperty:"quarterly-note"},yearly:{folder:"periodic/yearly",templateFile:"Templates/Yearly note",nameFormat:"YYYY",typeProperty:"yearly-note"},recentFiles:{maxItems:50,updateOn:"file-open",omittedPaths:[],omittedTags:[]}};var g=require("obsidian"),W=class extends g.PluginSettingTab{constructor(p,t,a,i){super(p,t),this.plugin=t,this.settings=a,this.onSettingsChange=i}display(){let{containerEl:p}=this;p.empty(),new g.Setting(p).setHeading().setName("Calendar"),new g.Setting(p).setName("First day of week").setDesc("Which day the calendar week starts on.").addDropdown(i=>{i.addOption("0","Sunday").addOption("1","Monday").setValue(String(this.settings.calendar.firstDayOfWeek)).onChange(n=>{this.settings.calendar.firstDayOfWeek=parseInt(n,10),this.saveAndRefresh()})}),new g.Setting(p).setName("Show note indicators").setDesc("Show a dot on days that have existing notes.").addToggle(i=>{i.setValue(this.settings.calendar.showNoteIndicators).onChange(n=>{this.settings.calendar.showNoteIndicators=n,this.saveAndRefresh()})}),new g.Setting(p).setHeading().setName("Periodic Note Paths"),this.addPeriodNoteSettings("Daily",this.settings.daily),this.addPeriodNoteSettings("Weekly",this.settings.weekly),this.addPeriodNoteSettings("Monthly",this.settings.monthly),this.addPeriodNoteSettings("Quarterly",this.settings.quarterly),this.addPeriodNoteSettings("Yearly",this.settings.yearly),new g.Setting(p).setHeading().setName("Recent Files"),new g.Setting(p).setName("Max items").setDesc("Maximum number of recent files to track.").addText(i=>{i.inputEl.setAttr("type","number"),i.inputEl.setAttr("placeholder","50"),i.setValue(String(this.settings.recentFiles.maxItems)),i.inputEl.onblur=()=>{let n=parseInt(i.getValue(),10);!isNaN(n)&&n>0&&(this.settings.recentFiles.maxItems=n,this.saveAndRefresh())}}),new g.Setting(p).setName("Update on").setDesc("When to add a file to the recent list.").addDropdown(i=>{i.addOption("file-open","File opened").addOption("file-edit","File changed").setValue(this.settings.recentFiles.updateOn).onChange(n=>{this.settings.recentFiles.updateOn=n,this.saveAndRefresh()})});let t=new DocumentFragment;t.appendText("Regex patterns for paths to exclude. One per line."),new g.Setting(p).setName("Omitted paths").setDesc(t).addTextArea(i=>{i.inputEl.setAttr("rows",4),i.setPlaceholder(`^archives/
|
var $=Object.defineProperty;var j=Object.getOwnPropertyDescriptor;var z=Object.getOwnPropertyNames;var H=Object.prototype.hasOwnProperty;var U=(w,p)=>{for(var t in p)$(w,t,{get:p[t],enumerable:!0})},X=(w,p,t,a)=>{if(p&&typeof p=="object"||typeof p=="function")for(let n of z(p))!H.call(w,n)&&n!==t&&$(w,n,{get:()=>p[n],enumerable:!(a=j(p,n))||a.enumerable});return w};var K=w=>X($({},"__esModule",{value:!0}),w);var ee={};U(ee,{default:()=>R});module.exports=K(ee);var g=require("obsidian");var _={calendar:{firstDayOfWeek:1,showNoteIndicators:!0},daily:{folder:"periodic/daily",templateFile:"Templates/Daily note",nameFormat:"YYYY-MM-DD",typeProperty:"daily-note"},weekly:{folder:"periodic/weekly",templateFile:"Templates/Weekly note",nameFormat:"GGGG-[W]WW",typeProperty:"weekly-note"},monthly:{folder:"periodic/monthly",templateFile:"Templates/Monthly note",nameFormat:"YYYY-MM",typeProperty:"monthly-note"},quarterly:{folder:"periodic/quarterly",templateFile:"Templates/Quarterly note",nameFormat:"YYYY-[Q]Q",typeProperty:"quarterly-note"},yearly:{folder:"periodic/yearly",templateFile:"Templates/Yearly note",nameFormat:"YYYY",typeProperty:"yearly-note"},recentFiles:{maxItems:50,updateOn:"file-open",omittedPaths:[],omittedTags:[]}};var f=require("obsidian"),W=class extends f.PluginSettingTab{constructor(p,t,a,n){super(p,t),this.plugin=t,this.settings=a,this.onSettingsChange=n}display(){let{containerEl:p}=this;p.empty(),new f.Setting(p).setHeading().setName("Calendar"),new f.Setting(p).setName("First day of week").setDesc("Which day the calendar week starts on.").addDropdown(n=>{n.addOption("0","Sunday").addOption("1","Monday").setValue(String(this.settings.calendar.firstDayOfWeek)).onChange(o=>{this.settings.calendar.firstDayOfWeek=parseInt(o,10),this.saveAndRefresh()})}),new f.Setting(p).setName("Show note indicators").setDesc("Show a dot on days that have existing notes.").addToggle(n=>{n.setValue(this.settings.calendar.showNoteIndicators).onChange(o=>{this.settings.calendar.showNoteIndicators=o,this.saveAndRefresh()})}),new f.Setting(p).setHeading().setName("Periodic Note Paths"),this.addPeriodNoteSettings("Daily",this.settings.daily),this.addPeriodNoteSettings("Weekly",this.settings.weekly),this.addPeriodNoteSettings("Monthly",this.settings.monthly),this.addPeriodNoteSettings("Quarterly",this.settings.quarterly),this.addPeriodNoteSettings("Yearly",this.settings.yearly),new f.Setting(p).setHeading().setName("Recent Files"),new f.Setting(p).setName("Max items").setDesc("Maximum number of recent files to track.").addText(n=>{n.inputEl.setAttr("type","number"),n.inputEl.setAttr("placeholder","50"),n.setValue(String(this.settings.recentFiles.maxItems)),n.inputEl.onblur=()=>{let o=parseInt(n.getValue(),10);!isNaN(o)&&o>0&&(this.settings.recentFiles.maxItems=o,this.saveAndRefresh())}}),new f.Setting(p).setName("Update on").setDesc("When to add a file to the recent list.").addDropdown(n=>{n.addOption("file-open","File opened").addOption("file-edit","File changed").setValue(this.settings.recentFiles.updateOn).onChange(o=>{this.settings.recentFiles.updateOn=o,this.saveAndRefresh()})});let t=new DocumentFragment;t.appendText("Regex patterns for paths to exclude. One per line."),new f.Setting(p).setName("Omitted paths").setDesc(t).addTextArea(n=>{n.inputEl.setAttr("rows",4),n.setPlaceholder(`^archives/
|
||||||
\\.png$`),i.setValue(this.settings.recentFiles.omittedPaths.join(`
|
\\.png$`),n.setValue(this.settings.recentFiles.omittedPaths.join(`
|
||||||
`)),i.inputEl.onblur=()=>{this.settings.recentFiles.omittedPaths=i.getValue().split(`
|
`)),n.inputEl.onblur=()=>{this.settings.recentFiles.omittedPaths=n.getValue().split(`
|
||||||
`).filter(n=>n.trim()),this.saveAndRefresh()}});let a=new DocumentFragment;a.appendText("Regex patterns for frontmatter tags to exclude. One per line."),new g.Setting(p).setName("Omitted tags").setDesc(a).addTextArea(i=>{i.inputEl.setAttr("rows",4),i.setPlaceholder(`ignore
|
`).filter(o=>o.trim()),this.saveAndRefresh()}});let a=new DocumentFragment;a.appendText("Regex patterns for frontmatter tags to exclude. One per line."),new f.Setting(p).setName("Omitted tags").setDesc(a).addTextArea(n=>{n.inputEl.setAttr("rows",4),n.setPlaceholder(`ignore
|
||||||
archive`),i.setValue(this.settings.recentFiles.omittedTags.join(`
|
archive`),n.setValue(this.settings.recentFiles.omittedTags.join(`
|
||||||
`)),i.inputEl.onblur=()=>{this.settings.recentFiles.omittedTags=i.getValue().split(`
|
`)),n.inputEl.onblur=()=>{this.settings.recentFiles.omittedTags=n.getValue().split(`
|
||||||
`).filter(n=>n.trim()),this.saveAndRefresh()}})}addPeriodNoteSettings(p,t){new g.Setting(this.containerEl).setHeading().setName(p),new g.Setting(this.containerEl).setName("Folder").setDesc(`Folder path for ${p.toLowerCase()} notes.`).addText(a=>{a.setPlaceholder("periodic/daily"),a.setValue(t.folder),a.onChange(i=>{t.folder=i,this.saveAndRefresh()})}),new g.Setting(this.containerEl).setName("Name format").setDesc(`Date format for ${p.toLowerCase()} note filenames (moment.js format).`).addText(a=>{a.setPlaceholder("yyyy-MM-dd"),a.setValue(t.nameFormat),a.onChange(i=>{t.nameFormat=i,this.saveAndRefresh()})}),new g.Setting(this.containerEl).setName("Template file").setDesc("Path to the template file (without .md extension).").addText(a=>{a.setPlaceholder("Templates/Daily note"),a.setValue(t.templateFile),a.onChange(i=>{t.templateFile=i,this.saveAndRefresh()})}),new g.Setting(this.containerEl).setName("Type property").setDesc("Value for the 'type' frontmatter property.").addText(a=>{a.setPlaceholder("daily-note"),a.setValue(t.typeProperty),a.onChange(i=>{t.typeProperty=i,this.saveAndRefresh()})})}async saveAndRefresh(){await this.plugin.saveData(this.settings),this.onSettingsChange()}};var h=require("obsidian");var F=require("obsidian");function j(v,p,t){let a=(0,F.moment)({year:v,month:p,day:1}),i=(0,F.moment)(a).endOf("month"),n=(0,F.moment)(a).subtract((a.day()-t+7)%7,"days"),e=(0,F.moment)().startOf("day"),r=[],s=(0,F.moment)(n);for(;s.isBefore(i)||s.month()===p;){let o=[];for(let l=0;l<7;l++)o.push({date:(0,F.moment)(s),dayOfMonth:s.date(),isToday:s.isSame(e,"day"),isCurrentMonth:s.month()===p,isoWeekNumber:s.isoWeek()}),s.add(1,"day");if(r.push({weekNumber:o[0].isoWeekNumber,days:o}),r.length>=6)break}return r}var E="waypoint-view",Y=class extends h.ItemView{constructor(t,a){super(t);this.redraw=()=>{this.contentEl.empty(),this.contentEl.addClass("waypoint-view"),this.renderFavorites(),this.renderRecentFiles(),this.renderCalendar()};this.currentDisplayMonth=(0,h.moment)().month();this.currentDisplayYear=(0,h.moment)().year();this.dragId=null;this.plugin=a}getViewType(){return E}getDisplayText(){return"Waypoint"}getIcon(){return"compass"}async onOpen(){this.redraw()}async onClose(){}renderCalendar(){let t=this.contentEl.createDiv({cls:"waypoint-section"});t.createDiv({cls:"waypoint-section-header",text:"Calendar"});let a=t.createDiv({cls:"waypoint-calendar"}),i=(0,h.moment)(),n=(0,h.moment)({year:this.currentDisplayYear,month:this.currentDisplayMonth,day:1}),e=a.createDiv({cls:"waypoint-calendar-top"}),r=e.createDiv({cls:"waypoint-calendar-breadcrumb"}),s=n.format("[Q]Q");r.createSpan({cls:"waypoint-clickable",text:s}).addEventListener("click",()=>{this.plugin.openPeriodNote("quarter",n)});let l=n.format("MMMM");r.createSpan({cls:"waypoint-clickable",text:l}).addEventListener("click",()=>{this.plugin.openPeriodNote("month",n)});let d=n.format("YYYY");r.createSpan({cls:"waypoint-clickable",text:d}).addEventListener("click",()=>{this.plugin.openPeriodNote("year",n)});let w=e.createDiv({cls:"waypoint-calendar-today-group"}),x=w.createEl("button",{cls:"waypoint-calendar-nav-btn"});(0,h.setIcon)(x,"chevron-left"),x.addEventListener("click",()=>this.navigateMonth(-1)),w.createEl("button",{cls:"waypoint-calendar-today-btn",text:"Today"}).addEventListener("click",()=>{this.currentDisplayMonth=(0,h.moment)().month(),this.currentDisplayYear=(0,h.moment)().year(),this.redraw()});let L=w.createEl("button",{cls:"waypoint-calendar-nav-btn"});(0,h.setIcon)(L,"chevron-right"),L.addEventListener("click",()=>this.navigateMonth(1));let P=a.createEl("table"),I=P.createEl("thead").createEl("tr");I.createEl("th",{text:""});let f=["sun","mon","tue","wed","thu","fri","sat"],N=this.plugin.settings.calendar.firstDayOfWeek;for(let y=0;y<7;y++){let M=(N+y)%7;I.createEl("th",{text:f[M]})}let k=P.createEl("tbody"),b=j(this.currentDisplayYear,this.currentDisplayMonth,this.plugin.settings.calendar.firstDayOfWeek);for(let y of b){let M=k.createEl("tr"),B=M.createEl("td",{cls:"waypoint-weeknum"});B.setText(String(y.weekNumber)),B.addEventListener("click",()=>{let D=y.days[0].date;this.plugin.openPeriodNote("week",D)});for(let D of y.days){let C=M.createEl("td",{cls:"waypoint-day"});if(C.setText(String(D.dayOfMonth)),D.isCurrentMonth||C.addClass("other-month"),D.isToday&&C.addClass("today"),this.plugin.settings.calendar.showNoteIndicators){let O=D.date.format("YYYY-MM-DD");this.plugin.app.vault.getFiles().some(G=>G.extension==="md"&&G.basename===O)&&C.addClass("has-note")}C.addEventListener("click",()=>{this.plugin.openPeriodNote("day",D.date)})}}}navigateMonth(t){let a=(0,h.moment)({year:this.currentDisplayYear,month:this.currentDisplayMonth}).add(t,"month");this.currentDisplayMonth=a.month(),this.currentDisplayYear=a.year(),this.redraw()}renderRecentFiles(){let t=this.contentEl.createDiv({cls:"waypoint-section waypoint-recent-files"});if(t.createDiv({cls:"waypoint-section-header",text:"Recent Files"}),this.plugin.recentFiles.length===0){
Line truncated
|
`).filter(o=>o.trim()),this.saveAndRefresh()}})}addPeriodNoteSettings(p,t){new f.Setting(this.containerEl).setHeading().setName(p),new f.Setting(this.containerEl).setName("Folder").setDesc(`Folder path for ${p.toLowerCase()} notes.`).addText(a=>{a.setPlaceholder("periodic/daily"),a.setValue(t.folder),a.onChange(n=>{t.folder=n,this.saveAndRefresh()})}),new f.Setting(this.containerEl).setName("Name format").setDesc(`Date format for ${p.toLowerCase()} note filenames (moment.js format).`).addText(a=>{a.setPlaceholder("yyyy-MM-dd"),a.setValue(t.nameFormat),a.onChange(n=>{t.nameFormat=n,this.saveAndRefresh()})}),new f.Setting(this.containerEl).setName("Template file").setDesc("Path to the template file (without .md extension).").addText(a=>{a.setPlaceholder("Templates/Daily note"),a.setValue(t.templateFile),a.onChange(n=>{t.templateFile=n,this.saveAndRefresh()})}),new f.Setting(this.containerEl).setName("Type property").setDesc("Value for the 'type' frontmatter property.").addText(a=>{a.setPlaceholder("daily-note"),a.setValue(t.typeProperty),a.onChange(n=>{t.typeProperty=n,this.saveAndRefresh()})})}async saveAndRefresh(){await this.plugin.saveData(this.settings),this.onSettingsChange()}};var h=require("obsidian");var F=require("obsidian");function Q(w,p,t){let a=(0,F.moment)({year:w,month:p,day:1}),n=(0,F.moment)(a).endOf("month"),o=(0,F.moment)(a).subtract((a.day()-t+7)%7,"days"),e=(0,F.moment)().startOf("day"),r=[],i=(0,F.moment)(o);for(;i.isBefore(n)||i.month()===p;){let c=[];for(let s=0;s<7;s++)c.push({date:(0,F.moment)(i),dayOfMonth:i.date(),isToday:i.isSame(e,"day"),isCurrentMonth:i.month()===p,isoWeekNumber:i.isoWeek()}),i.add(1,"day");if(r.push({weekNumber:c[0].isoWeekNumber,days:c}),r.length>=6)break}return r}var x="waypoint-view",Y=class extends h.ItemView{constructor(t,a){super(t);this.redraw=()=>{this.contentEl.empty(),this.contentEl.addClass("waypoint-view"),this.renderFavorites(),this.renderRecentFiles(),this.renderCalendar()};this.currentDisplayMonth=(0,h.moment)().month();this.currentDisplayYear=(0,h.moment)().year();this.dragId=null;this.plugin=a}getViewType(){return x}getDisplayText(){return"Waypoint"}getIcon(){return"compass"}async onOpen(){this.redraw()}async onClose(){}renderCalendar(){let t=this.contentEl.createDiv({cls:"waypoint-section"});t.createDiv({cls:"waypoint-section-header",text:"Calendar"});let a=t.createDiv({cls:"waypoint-calendar"}),n=(0,h.moment)(),o=(0,h.moment)({year:this.currentDisplayYear,month:this.currentDisplayMonth,day:1}),e=a.createDiv({cls:"waypoint-calendar-top"}),r=e.createDiv({cls:"waypoint-calendar-breadcrumb"}),i=o.format("[Q]Q");r.createSpan({cls:"waypoint-clickable",text:i}).addEventListener("click",()=>{this.plugin.openPeriodNote("quarter",o)});let s=o.format("MMMM");r.createSpan({cls:"waypoint-clickable",text:s}).addEventListener("click",()=>{this.plugin.openPeriodNote("month",o)});let d=o.format("YYYY");r.createSpan({cls:"waypoint-clickable",text:d}).addEventListener("click",()=>{this.plugin.openPeriodNote("year",o)});let u=e.createDiv({cls:"waypoint-calendar-today-group"}),b=u.createEl("button",{cls:"waypoint-calendar-nav-btn"});(0,h.setIcon)(b,"chevron-left"),b.addEventListener("click",()=>this.navigateMonth(-1)),u.createEl("button",{cls:"waypoint-calendar-today-btn",text:"Today"}).addEventListener("click",()=>{this.currentDisplayMonth=(0,h.moment)().month(),this.currentDisplayYear=(0,h.moment)().year(),this.redraw()});let L=u.createEl("button",{cls:"waypoint-calendar-nav-btn"});(0,h.setIcon)(L,"chevron-right"),L.addEventListener("click",()=>this.navigateMonth(1));let P=a.createEl("table"),C=P.createEl("thead").createEl("tr");C.createEl("th",{text:""});let y=["sun","mon","tue","wed","thu","fri","sat"],B=this.plugin.settings.calendar.firstDayOfWeek;for(let v=0;v<7;v++){let M=(B+v)%7;C.createEl("th",{text:y[M]})}let k=P.createEl("tbody"),D=Q(this.currentDisplayYear,this.currentDisplayMonth,this.plugin.settings.calendar.firstDayOfWeek);for(let v of D){let M=k.createEl("tr"),N=M.createEl("td",{cls:"waypoint-weeknum"});N.setText(String(v.weekNumber)),N.addEventListener("click",()=>{let E=v.days[0].date;this.plugin.openPeriodNote("week",E)});for(let E of v.days){let T=M.createEl("td",{cls:"waypoint-day"});if(T.setText(String(E.dayOfMonth)),E.isCurrentMonth||T.addClass("other-month"),E.isToday&&T.addClass("today"),this.plugin.settings.calendar.showNoteIndicators){let O=E.date.format("YYYY-MM-DD");this.plugin.app.vault.getFiles().some(G=>G.extension==="md"&&G.basename===O)&&T.addClass("has-note")}T.addEventListener("click",()=>{this.plugin.openPeriodNote("day",E.date)})}}}navigateMonth(t){let a=(0,h.moment)({year:this.currentDisplayYear,month:this.currentDisplayMonth}).add(t,"month");this.currentDisplayMonth=a.month(),this.currentDisplayYear=a.year(),this.redraw()}renderRecentFiles(){let t=this.contentEl.createDiv({cls:"waypoint-section waypoint-recent-files"});if(t.createDiv({cls:"waypoint-section-header",text:"Recent Files"}),this.plugin.recentFiles.length===0){
Line truncated
|
||||||
type: ${e.typeProperty}
|
type: ${e.typeProperty}
|
||||||
date: ${a.format("YYYY-MM-DD")}
|
date: ${a.format("YYYY-MM-DD")}
|
||||||
---
|
---
|
||||||
|
|
||||||
`;o=await this.app.vault.create(s,d)}}catch(l){new u.Notice(`Failed to create ${n.label.toLowerCase()} note: ${l.message}`);return}new u.Notice(`Created ${n.label.toLowerCase()} note: ${r}`)}o&&await this.app.workspace.getLeaf(!1).openFile(o)}detectPeriodType(t){return/^\d{4}-\d{2}-\d{2}$/.test(t)?{period:"day",date:(0,u.moment)(t,"YYYY-MM-DD")}:/^\d{4}-W\d{2}$/.test(t)?{period:"week",date:(0,u.moment)(t,"GGGG-[W]WW")}:/^\d{4}-\d{2}$/.test(t)?{period:"month",date:(0,u.moment)(t,"YYYY-MM")}:/^\d{4}-Q[1-4]$/.test(t)?{period:"quarter",date:(0,u.moment)(t,"YYYY-[Q]Q")}:/^\d{4}$/.test(t)?{period:"year",date:(0,u.moment)(t,"YYYY")}:null}async navigatePeriodNote(t){let a=this.app.workspace.getActiveFile();if(!a){new u.Notice("No active file");return}let i=this.detectPeriodType(a.basename);if(!i){new u.Notice("Current file is not a periodic note (daily/weekly/monthly/quarterly/yearly)");return}let{period:n,date:e}=i;if(!e.isValid()){new u.Notice(`Could not parse date from filename: ${a.basename}`);return}let r=t==="next"?1:-1,s=n==="quarter"?e.clone().add(r*3,"months"):e.clone().add(r,`${n}s`);await this.openPeriodNote(n,s)}redrawAll(){this.broadcastRedraw()}broadcastRedraw(){let t=this.app.workspace.getLeavesOfType(E);for(let a of t)a.view instanceof Y&&a.view.redraw()}async getNotesForDate(t){return this.app.vault.getFiles().filter(a=>a.extension==="md"&&a.basename===t)}async hasNoteForDate(t){return this.app.vault.getFiles().some(a=>a.extension==="md"&&a.basename===t)}};
|
`;c=await this.app.vault.create(i,d)}}catch(s){new g.Notice(`Failed to create ${o.label.toLowerCase()} note: ${s.message}`);return}new g.Notice(`Created ${o.label.toLowerCase()} note: ${r}`)}c&&await this.app.workspace.getLeaf(!1).openFile(c)}detectPeriodType(t){return/^\d{4}-\d{2}-\d{2}$/.test(t)?{period:"day",date:(0,g.moment)(t,"YYYY-MM-DD")}:/^\d{4}-W\d{2}$/.test(t)?{period:"week",date:(0,g.moment)(t,"GGGG-[W]WW")}:/^\d{4}-\d{2}$/.test(t)?{period:"month",date:(0,g.moment)(t,"YYYY-MM")}:/^\d{4}-Q[1-4]$/.test(t)?{period:"quarter",date:(0,g.moment)(t,"YYYY-[Q]Q")}:/^\d{4}$/.test(t)?{period:"year",date:(0,g.moment)(t,"YYYY")}:null}async navigatePeriodNote(t){let a=this.app.workspace.getActiveFile();if(!a){new g.Notice("No active file");return}let n=this.detectPeriodType(a.basename);if(!n){new g.Notice("Current file is not a periodic note (daily/weekly/monthly/quarterly/yearly)");return}let{period:o,date:e}=n;if(!e.isValid()){new g.Notice(`Could not parse date from filename: ${a.basename}`);return}let r=t==="next"?1:-1,i=o==="quarter"?e.clone().add(r*3,"months"):e.clone().add(r,`${o}s`);await this.openPeriodNote(o,i)}redrawAll(){this.broadcastRedraw()}broadcastRedraw(){let t=this.app.workspace.getLeavesOfType(x);for(let a of t)a.view instanceof Y&&a.view.redraw()}async getNotesForDate(t){return this.app.vault.getFiles().filter(a=>a.extension==="md"&&a.basename===t)}async hasNoteForDate(t){return this.app.vault.getFiles().some(a=>a.extension==="md"&&a.basename===t)}};
|
||||||
+63
-20
@@ -390,7 +390,7 @@ export class WaypointView extends ItemView {
|
|||||||
});
|
});
|
||||||
rowEl.addEventListener('dragend', () => {
|
rowEl.addEventListener('dragend', () => {
|
||||||
this.dragId = null;
|
this.dragId = null;
|
||||||
container.querySelectorAll('.waypoint-bm-dragging, .waypoint-bm-drop-line, .waypoint-bm-drop-below').forEach(el => {
|
container.querySelectorAll('.waypoint-bm-dragging, .waypoint-bm-drop-line, .waypoint-bm-drop-below, .waypoint-bm-drop-into').forEach(el => {
|
||||||
el.removeClass('waypoint-bm-dragging');
|
el.removeClass('waypoint-bm-dragging');
|
||||||
el.removeClass('waypoint-bm-drop-line');
|
el.removeClass('waypoint-bm-drop-line');
|
||||||
el.removeClass('waypoint-bm-drop-below');
|
el.removeClass('waypoint-bm-drop-below');
|
||||||
@@ -399,16 +399,17 @@ export class WaypointView extends ItemView {
|
|||||||
rowEl.addEventListener('dragenter', (e) => {
|
rowEl.addEventListener('dragenter', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (!this.dragId || this.dragId === item.id) return;
|
if (!this.dragId || this.dragId === item.id) return;
|
||||||
this.showDropIndicator(rowEl, e);
|
this.showDropIndicator(rowEl, e, false);
|
||||||
});
|
});
|
||||||
rowEl.addEventListener('dragover', (e) => {
|
rowEl.addEventListener('dragover', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (!this.dragId || this.dragId === item.id) return;
|
if (!this.dragId || this.dragId === item.id) return;
|
||||||
this.showDropIndicator(rowEl, e);
|
this.showDropIndicator(rowEl, e, false);
|
||||||
});
|
});
|
||||||
rowEl.addEventListener('dragleave', () => {
|
rowEl.addEventListener('dragleave', () => {
|
||||||
rowEl.removeClass('waypoint-bm-drop-line');
|
rowEl.removeClass('waypoint-bm-drop-line');
|
||||||
rowEl.removeClass('waypoint-bm-drop-below');
|
rowEl.removeClass('waypoint-bm-drop-below');
|
||||||
|
rowEl.removeClass('waypoint-bm-drop-into');
|
||||||
});
|
});
|
||||||
rowEl.addEventListener('drop', (e) => {
|
rowEl.addEventListener('drop', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@@ -448,7 +449,7 @@ export class WaypointView extends ItemView {
|
|||||||
});
|
});
|
||||||
rowEl.addEventListener('dragend', () => {
|
rowEl.addEventListener('dragend', () => {
|
||||||
this.dragId = null;
|
this.dragId = null;
|
||||||
container.querySelectorAll('.waypoint-bm-dragging, .waypoint-bm-drop-line, .waypoint-bm-drop-below').forEach(el => {
|
container.querySelectorAll('.waypoint-bm-dragging, .waypoint-bm-drop-line, .waypoint-bm-drop-below, .waypoint-bm-drop-into').forEach(el => {
|
||||||
el.removeClass('waypoint-bm-dragging');
|
el.removeClass('waypoint-bm-dragging');
|
||||||
el.removeClass('waypoint-bm-drop-line');
|
el.removeClass('waypoint-bm-drop-line');
|
||||||
el.removeClass('waypoint-bm-drop-below');
|
el.removeClass('waypoint-bm-drop-below');
|
||||||
@@ -457,16 +458,17 @@ export class WaypointView extends ItemView {
|
|||||||
rowEl.addEventListener('dragenter', (e) => {
|
rowEl.addEventListener('dragenter', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (!this.dragId || this.dragId === item.id) return;
|
if (!this.dragId || this.dragId === item.id) return;
|
||||||
this.showDropIndicator(rowEl, e);
|
this.showDropIndicator(rowEl, e, false);
|
||||||
});
|
});
|
||||||
rowEl.addEventListener('dragover', (e) => {
|
rowEl.addEventListener('dragover', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (!this.dragId || this.dragId === item.id) return;
|
if (!this.dragId || this.dragId === item.id) return;
|
||||||
this.showDropIndicator(rowEl, e);
|
this.showDropIndicator(rowEl, e, false);
|
||||||
});
|
});
|
||||||
rowEl.addEventListener('dragleave', () => {
|
rowEl.addEventListener('dragleave', () => {
|
||||||
rowEl.removeClass('waypoint-bm-drop-line');
|
rowEl.removeClass('waypoint-bm-drop-line');
|
||||||
rowEl.removeClass('waypoint-bm-drop-below');
|
rowEl.removeClass('waypoint-bm-drop-below');
|
||||||
|
rowEl.removeClass('waypoint-bm-drop-into');
|
||||||
});
|
});
|
||||||
rowEl.addEventListener('drop', (e) => {
|
rowEl.addEventListener('drop', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@@ -507,30 +509,34 @@ export class WaypointView extends ItemView {
|
|||||||
rowEl.addClass('waypoint-bm-dragging');
|
rowEl.addClass('waypoint-bm-dragging');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const canAcceptChildren = isGroup || (item.children && item.children.length > 0);
|
||||||
|
|
||||||
rowEl.addEventListener('dragend', () => {
|
rowEl.addEventListener('dragend', () => {
|
||||||
this.dragId = null;
|
this.dragId = null;
|
||||||
container.querySelectorAll('.waypoint-bm-dragging, .waypoint-bm-drop-line, .waypoint-bm-drop-below').forEach(el => {
|
container.querySelectorAll('.waypoint-bm-dragging, .waypoint-bm-drop-line, .waypoint-bm-drop-below, .waypoint-bm-drop-into').forEach(el => {
|
||||||
el.removeClass('waypoint-bm-dragging');
|
el.removeClass('waypoint-bm-dragging');
|
||||||
el.removeClass('waypoint-bm-drop-line');
|
el.removeClass('waypoint-bm-drop-line');
|
||||||
el.removeClass('waypoint-bm-drop-below');
|
el.removeClass('waypoint-bm-drop-below');
|
||||||
|
el.removeClass('waypoint-bm-drop-into');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
rowEl.addEventListener('dragenter', (e) => {
|
rowEl.addEventListener('dragenter', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (!this.dragId || this.dragId === item.id) return;
|
if (!this.dragId || this.dragId === item.id) return;
|
||||||
this.showDropIndicator(rowEl, e);
|
this.showDropIndicator(rowEl, e, canAcceptChildren);
|
||||||
});
|
});
|
||||||
|
|
||||||
rowEl.addEventListener('dragover', (e) => {
|
rowEl.addEventListener('dragover', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (!this.dragId || this.dragId === item.id) return;
|
if (!this.dragId || this.dragId === item.id) return;
|
||||||
this.showDropIndicator(rowEl, e);
|
this.showDropIndicator(rowEl, e, canAcceptChildren);
|
||||||
});
|
});
|
||||||
|
|
||||||
rowEl.addEventListener('dragleave', () => {
|
rowEl.addEventListener('dragleave', () => {
|
||||||
rowEl.removeClass('waypoint-bm-drop-line');
|
rowEl.removeClass('waypoint-bm-drop-line');
|
||||||
rowEl.removeClass('waypoint-bm-drop-below');
|
rowEl.removeClass('waypoint-bm-drop-below');
|
||||||
|
rowEl.removeClass('waypoint-bm-drop-into');
|
||||||
});
|
});
|
||||||
|
|
||||||
rowEl.addEventListener('drop', (e) => {
|
rowEl.addEventListener('drop', (e) => {
|
||||||
@@ -538,12 +544,18 @@ export class WaypointView extends ItemView {
|
|||||||
this.dragId = null;
|
this.dragId = null;
|
||||||
rowEl.removeClass('waypoint-bm-drop-line');
|
rowEl.removeClass('waypoint-bm-drop-line');
|
||||||
rowEl.removeClass('waypoint-bm-drop-below');
|
rowEl.removeClass('waypoint-bm-drop-below');
|
||||||
|
rowEl.removeClass('waypoint-bm-drop-into');
|
||||||
|
|
||||||
const draggedId = e.dataTransfer?.getData('text/plain');
|
const draggedId = e.dataTransfer?.getData('text/plain');
|
||||||
if (!draggedId || draggedId === item.id) return;
|
if (!draggedId || draggedId === item.id) return;
|
||||||
|
|
||||||
const dropAbove = (rowEl as any).__dropAbove;
|
const dropInto = (rowEl as any).__dropInto;
|
||||||
this.moveBookmarkToPosition(draggedId, item.id, dropAbove);
|
if (dropInto && canAcceptChildren) {
|
||||||
|
this.moveBookmarkToGroup(draggedId, item.id);
|
||||||
|
} else {
|
||||||
|
const dropAbove = (rowEl as any).__dropAbove;
|
||||||
|
this.moveBookmarkToPosition(draggedId, item.id, dropAbove);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── Group: chevron + icon + label ──
|
// ── Group: chevron + icon + label ──
|
||||||
@@ -808,25 +820,47 @@ export class WaypointView extends ItemView {
|
|||||||
menu.showAtPosition({ x: event.clientX, y: event.clientY });
|
menu.showAtPosition({ x: event.clientX, y: event.clientY });
|
||||||
}
|
}
|
||||||
|
|
||||||
private showDropIndicator(el: HTMLElement, e: MouseEvent): void {
|
private showDropIndicator(el: HTMLElement, e: MouseEvent, isGroupLike: boolean): void {
|
||||||
// Clear indicator from all siblings first
|
// Clear all indicators
|
||||||
const parent = el.parentElement;
|
const parent = el.parentElement;
|
||||||
if (parent) {
|
if (parent) {
|
||||||
parent.querySelectorAll('.waypoint-bm-drop-line, .waypoint-bm-drop-below').forEach(el2 => {
|
parent.querySelectorAll('.waypoint-bm-drop-line, .waypoint-bm-drop-below, .waypoint-bm-drop-into').forEach(el2 => {
|
||||||
el2.removeClass('waypoint-bm-drop-line');
|
el2.removeClass('waypoint-bm-drop-line');
|
||||||
el2.removeClass('waypoint-bm-drop-below');
|
el2.removeClass('waypoint-bm-drop-below');
|
||||||
|
el2.removeClass('waypoint-bm-drop-into');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const rect = el.getBoundingClientRect();
|
const rect = el.getBoundingClientRect();
|
||||||
const midY = rect.top + rect.height / 2;
|
const y = e.clientY;
|
||||||
const above = e.clientY < midY;
|
|
||||||
|
|
||||||
el.addClass('waypoint-bm-drop-line');
|
if (isGroupLike) {
|
||||||
if (!above) {
|
// 3-zone: top 25% = above, middle 50% = into, bottom 25% = below
|
||||||
el.addClass('waypoint-bm-drop-below');
|
const topThreshold = rect.top + rect.height * 0.25;
|
||||||
|
const bottomThreshold = rect.top + rect.height * 0.75;
|
||||||
|
|
||||||
|
if (y < topThreshold) {
|
||||||
|
el.addClass('waypoint-bm-drop-line');
|
||||||
|
(el as any).__dropAbove = true;
|
||||||
|
(el as any).__dropInto = false;
|
||||||
|
} else if (y > bottomThreshold) {
|
||||||
|
el.addClass('waypoint-bm-drop-line');
|
||||||
|
el.addClass('waypoint-bm-drop-below');
|
||||||
|
(el as any).__dropAbove = false;
|
||||||
|
(el as any).__dropInto = false;
|
||||||
|
} else {
|
||||||
|
el.addClass('waypoint-bm-drop-into');
|
||||||
|
(el as any).__dropAbove = false;
|
||||||
|
(el as any).__dropInto = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 2-zone: top half = above, bottom half = below
|
||||||
|
const above = y < rect.top + rect.height / 2;
|
||||||
|
el.addClass('waypoint-bm-drop-line');
|
||||||
|
if (!above) el.addClass('waypoint-bm-drop-below');
|
||||||
|
(el as any).__dropAbove = above;
|
||||||
|
(el as any).__dropInto = false;
|
||||||
}
|
}
|
||||||
(el as any).__dropAbove = above;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private moveBookmarkToGroup(itemId: string, targetGroupId: string | null): void {
|
private moveBookmarkToGroup(itemId: string, targetGroupId: string | null): void {
|
||||||
@@ -846,6 +880,15 @@ export class WaypointView extends ItemView {
|
|||||||
const item = removeRecursive(this.plugin.waypointData.bookmarks);
|
const item = removeRecursive(this.plugin.waypointData.bookmarks);
|
||||||
if (!item) return;
|
if (!item) return;
|
||||||
|
|
||||||
|
// Prevent dropping into self or own descendant
|
||||||
|
if (targetGroupId) {
|
||||||
|
const isDescendant = (parent: BookmarkItem, targetId: string): boolean => {
|
||||||
|
if (parent.id === targetId) return true;
|
||||||
|
return parent.children.some(c => isDescendant(c, targetId));
|
||||||
|
};
|
||||||
|
if (item.id === targetGroupId || isDescendant(item, targetGroupId)) return;
|
||||||
|
}
|
||||||
|
|
||||||
if (targetGroupId) {
|
if (targetGroupId) {
|
||||||
const findGroup = (items: BookmarkItem[]): BookmarkItem | null => {
|
const findGroup = (items: BookmarkItem[]): BookmarkItem | null => {
|
||||||
for (const i of items) {
|
for (const i of items) {
|
||||||
|
|||||||
+10
-2
@@ -44,11 +44,14 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
transition: color 80ms, background 80ms;
|
transition: color 80ms, background 80ms;
|
||||||
|
box-shadow: none;
|
||||||
|
opacity: 0.6;
|
||||||
}
|
}
|
||||||
|
|
||||||
.waypoint-header-more:hover {
|
.waypoint-header-more:hover {
|
||||||
color: var(--text-accent);
|
color: var(--text-normal);
|
||||||
background-color: var(--background-modifier-active-hover);
|
background: none;
|
||||||
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ── Calendar ── */
|
/* ── Calendar ── */
|
||||||
@@ -287,6 +290,11 @@
|
|||||||
border-bottom: 3px solid var(--text-accent) !important;
|
border-bottom: 3px solid var(--text-accent) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.waypoint-favorites .waypoint-bm-drop-into {
|
||||||
|
background-color: var(--background-modifier-active-hover) !important;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
/* ── Separator & Spacer ── */
|
/* ── Separator & Spacer ── */
|
||||||
|
|
||||||
.waypoint-favorites .waypoint-bookmark-item.waypoint-bookmark-separator {
|
.waypoint-favorites .waypoint-bookmark-item.waypoint-bookmark-separator {
|
||||||
|
|||||||
Reference in new issue
Block a user