Skip to content

Commit

Permalink
release: 0.37.11
Browse files Browse the repository at this point in the history
  • Loading branch information
@RyotaUshio
RyotaUshio committed Mar 5, 2024
1 parent 7ee0158 commit 11f16fd
Show file tree
Hide file tree
Showing 24 changed files with 969 additions and 583 deletions.
1 change: 1 addition & 0 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
},
"rules": {
"no-unused-vars": "off",
"no-cond-assign": "off",
"@typescript-eslint/no-unused-vars": ["error", { "args": "none" }],
"@typescript-eslint/ban-ts-comment": "off",
"no-prototype-builtins": "off",
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "pdf-plus",
"name": "PDF++",
"version": "0.37.10",
"version": "0.37.11",
"minAppVersion": "1.4.16",
"description": "The most Obsidian-native PDF annotation tool ever.",
"author": "Ryota Ushio",
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obsidian-pdf-plus",
"version": "0.37.10",
"version": "0.37.11",
"description": "The most Obsidian-native PDF annotation tool ever.",
"scripts": {
"dev": "node esbuild.config.mjs",
Expand Down
358 changes: 157 additions & 201 deletions src/backlink-visualizer.ts
View file

Large diffs are not rendered by default.

180 changes: 95 additions & 85 deletions src/color-palette.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { KeysOfType, getEventCoord, isHexString } from 'utils';
import { Rect } from 'typings';


type ColorPaletteState = Pick<ColorPalette, 'selectedColorName' | 'actionIndex' | 'displayTextFormatIndex' | 'writeFile'>;
export type ColorPaletteState = Pick<ColorPalette, 'selectedColorName' | 'actionIndex' | 'displayTextFormatIndex' | 'writeFile'>;

export class ColorPalette extends Component {
static readonly CLS = 'pdf-plus-color-palette';
Expand All @@ -22,6 +22,7 @@ export class ColorPalette extends Component {
actionMenuEl: HTMLElement | null;
displayTextFormatMenuEl: HTMLElement | null;
writeFileButtonEl: HTMLElement | null;
cropButtonEl: HTMLElement | null;
statusContainerEl: HTMLElement | null;
statusEl: HTMLElement | null;

Expand All @@ -42,6 +43,7 @@ export class ColorPalette extends Component {
this.actionMenuEl = null;
this.displayTextFormatMenuEl = null;
this.writeFileButtonEl = null;
this.cropButtonEl = null;
this.statusContainerEl = null;
this.statusEl = null;

Expand Down Expand Up @@ -238,7 +240,7 @@ export class ColorPalette extends Component {
addWriteFileToggle(paletteEl: HTMLElement) {
this.writeFileButtonEl = paletteEl.createDiv('clickable-icon', (el) => {
setIcon(el, 'lucide-save');
setTooltip(el, `${this.plugin.manifest.name}: Add highlights to file directly`);
setTooltip(el, `${this.plugin.manifest.name}: Add ${this.plugin.settings.selectionBacklinkVisualizeStyle}s to file directly`);
el.addEventListener('click', () => {
this.setWriteFile(!this.writeFile);

Expand All @@ -257,95 +259,103 @@ export class ColorPalette extends Component {
}

addCropButton(paletteEl: HTMLElement) {
paletteEl.createDiv('clickable-icon pdf-plus-rect-select', (el) => {
this.cropButtonEl = paletteEl.createDiv('clickable-icon pdf-plus-rect-select', (el) => {
setIcon(el, 'lucide-box-select');
setTooltip(el, 'Copy embed link to rectangular selection')

el.addEventListener('click', () => {
const child = this.lib.getPDFViewerChildAssociatedWithNode(this.paletteEl!);
if (!child || !child.pdfViewer.pdfViewer) return;
const pageView = child.getPage(child.pdfViewer.pdfViewer.currentPageNumber);
const pageEl = pageView.div
if (!pageEl) return;

const selectBox = { left: 0, top: 0, width: 0, height: 0 };
const onMouseDown = (evt: MouseEvent | TouchEvent) => {
const { x, y } = getEventCoord(evt);
selectBox.left = x;
selectBox.top = y;

const boxEl = pageEl.createDiv('pdf-plus-select-box');
const pageRect = pageEl.getBoundingClientRect();
boxEl.setCssStyles({
left: (selectBox.left - pageRect.left) + 'px',
top: (selectBox.top - pageRect.top) + 'px',
});
this.startRectangularSelection(false);
});
});
}

const onMouseMove = (evt: MouseEvent | TouchEvent) => {
const { x, y } = getEventCoord(evt);
selectBox.width = x - selectBox.left;
selectBox.height = y - selectBox.top;

boxEl.setCssStyles({
width: selectBox.width + 'px',
height: selectBox.height + 'px',
});

// Prevent scrolling on mobile
evt.preventDefault();
evt.stopImmediatePropagation();
};

const onMouseUp = () => {
pageEl.removeEventListener('mousemove', onMouseMove);
pageEl.removeEventListener('touchmove', onMouseMove);
pageEl.removeEventListener('mouseup', onMouseUp);
pageEl.removeEventListener('touchend', onMouseUp);
pageEl.removeChild(boxEl);

const left = selectBox.left - pageRect.left;
const top = selectBox.top - pageRect.top;
const right = left + selectBox.width;
const bottom = top + selectBox.height;

const rect = window.pdfjsLib.Util.normalizeRect([
...pageView.getPagePoint(left, bottom),
...pageView.getPagePoint(right, top)
]) as Rect;

this.lib.copyLink.copyEmbedLinkToRect(
false, child, pageView.id, rect,
this.plugin.settings.includeColorWhenCopyingRectLink
? this.selectedColorName ?? undefined
: undefined
);
toggle();
};

pageEl.addEventListener('mousemove', onMouseMove);
pageEl.addEventListener('touchmove', onMouseMove);
pageEl.addEventListener('mouseup', onMouseUp);
pageEl.addEventListener('touchend', onMouseUp);
};

const toggle = () => {
el.toggleClass('is-active', !el.hasClass('is-active'));
pageEl.toggleClass('pdf-plus-selecting', el.hasClass('is-active'));

activeWindow.getSelection()?.empty();

if (el.hasClass('is-active')) {
pageEl.addEventListener('mousedown', onMouseDown);
pageEl.addEventListener('touchstart', onMouseDown);
} else {
pageEl.removeEventListener('mousedown', onMouseDown);
pageEl.removeEventListener('touchstart', onMouseDown);
}
};
startRectangularSelection(autoPaste: boolean) {
const cropButtonEl = this.cropButtonEl;
if (!cropButtonEl) return;

const child = this.lib.getPDFViewerChildAssociatedWithNode(this.paletteEl!);
if (!child || !child.pdfViewer.pdfViewer) return;
const pageView = child.getPage(child.pdfViewer.pdfViewer.currentPageNumber);
const pageEl = pageView.div
if (!pageEl) return;

const selectBox = { left: 0, top: 0, width: 0, height: 0 };
const onMouseDown = (evt: MouseEvent | TouchEvent) => {
const { x, y } = getEventCoord(evt);
selectBox.left = x;
selectBox.top = y;

const boxEl = pageEl.createDiv('pdf-plus-select-box');
const pageRect = pageEl.getBoundingClientRect();
boxEl.setCssStyles({
left: (selectBox.left - pageRect.left) + 'px',
top: (selectBox.top - pageRect.top) + 'px',
});

const onMouseMove = (evt: MouseEvent | TouchEvent) => {
const { x, y } = getEventCoord(evt);
selectBox.width = x - selectBox.left;
selectBox.height = y - selectBox.top;

boxEl.setCssStyles({
width: selectBox.width + 'px',
height: selectBox.height + 'px',
});

// Prevent scrolling on mobile
evt.preventDefault();
evt.stopImmediatePropagation();
};

const onMouseUp = () => {
pageEl.removeEventListener('mousemove', onMouseMove);
pageEl.removeEventListener('touchmove', onMouseMove);
pageEl.removeEventListener('mouseup', onMouseUp);
pageEl.removeEventListener('touchend', onMouseUp);
pageEl.removeChild(boxEl);

const left = selectBox.left - pageRect.left;
const top = selectBox.top - pageRect.top;
const right = left + selectBox.width;
const bottom = top + selectBox.height;

const rect = window.pdfjsLib.Util.normalizeRect([
...pageView.getPagePoint(left, bottom),
...pageView.getPagePoint(right, top)
]) as Rect;

this.lib.copyLink.copyEmbedLinkToRect(
false, child, pageView.id, rect,
this.plugin.settings.includeColorWhenCopyingRectLink
? this.selectedColorName ?? undefined
: undefined,
autoPaste
);
toggle();
});
});
};

pageEl.addEventListener('mousemove', onMouseMove);
pageEl.addEventListener('touchmove', onMouseMove);
pageEl.addEventListener('mouseup', onMouseUp);
pageEl.addEventListener('touchend', onMouseUp);
};

const toggle = () => {
cropButtonEl.toggleClass('is-active', !cropButtonEl.hasClass('is-active'));
pageEl.toggleClass('pdf-plus-selecting', cropButtonEl.hasClass('is-active'));

activeWindow.getSelection()?.empty();

if (cropButtonEl.hasClass('is-active')) {
pageEl.addEventListener('mousedown', onMouseDown);
pageEl.addEventListener('touchstart', onMouseDown);
} else {
pageEl.removeEventListener('mousedown', onMouseDown);
pageEl.removeEventListener('touchstart', onMouseDown);
}
};

toggle();
}

setStatus(text: string, durationMs: number) {
Expand All @@ -364,7 +374,7 @@ export class ColorPalette extends Component {
setTooltipToActionItem(itemEl: HTMLElement, name: string | null) {
const pickerEl = itemEl.querySelector<HTMLInputElement>(':scope > .' + ColorPalette.CLS + '-item-inner')!;
const commandName = this.plugin.settings.copyCommands[this.actionIndex].name;
const tooltip = name !== null ? `Copy link with format "${commandName}" & add ${name.toLowerCase()} highlight` : `Copy link with "${commandName}" format without specifying color`;
const tooltip = name !== null ? `Copy link with format "${commandName}" & add ${name.toLowerCase()} ${this.plugin.settings.selectionBacklinkVisualizeStyle}` : `Copy link with "${commandName}" format without specifying color`;
setTooltip(pickerEl, tooltip);
}

Expand Down

0 comments on commit 11f16fd

Please sign in to comment.