Skip to content

refactor(kit): simplify kitDomToPng, kitRotationImage, kitChangeEventDisabled + optional peer deps #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdlabo merged 1 commit into from
Jul 2, 2026
Merged

refactor(kit): simplify kitDomToPng, kitRotationImage, kitChangeEventDisabled + optional peer deps #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions projects/kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
"dom-to-image-more": "^3.0.0",
"rxjs": "^7.8.0"
},
"peerDependenciesMeta": {
"@capacitor/preferences": { "optional": true },
"@capacitor/status-bar": { "optional": true },
"@capacitor-community/in-app-review": { "optional": true },
"@rdlabo/capacitor-brotherprint": { "optional": true },
"dom-to-image-more": { "optional": true }
},
"dependencies": {
"tslib": "^2.3.0"
},
Expand Down
41 changes: 18 additions & 23 deletions projects/kit/src/lib/printer/kit-printer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@ export const kitRotationImage = async (imageData: string): Promise<string> => {
const imgType = imageData.substring(5, imageData.indexOf(';'));

const image = new Image();
const loaded = () =>
new Promise<void>((resolve) => {
image.onload = () => resolve();
});
setTimeout(() => (image.src = imageData));
await loaded();
const loaded = new Promise<void>((resolve) => {
image.onload = () => resolve();
});
image.src = imageData;
await loaded;

const canvas = document.createElement('canvas');
const ctx = canvas.getContext('2d');
Expand Down Expand Up @@ -86,23 +85,19 @@ export const kitDomToPng = async (element: HTMLElement, options?: KitDomToPngOpt
// iOS: ないと下が途切れる。Android: あると黒線が入る。
const addClient = Capacitor.getPlatform() === 'ios' ? 2 : 0;

const dataUrl: string = await new Promise((resolve) => {
void (async () => {
for (let i = 0; i < 10; i++) {
const url = await domtoimage.toPng(element, {
width: clientWidth + addClient,
height: clientHeight + addClient,
scale: options?.scale ?? 3,
copyDefaultStyles: false,
});
if (url) {
resolve(url);
return;
}
}
resolve('');
})();
});
let dataUrl = '';
for (let i = 0; i < 10; i++) {
const url = await domtoimage.toPng(element, {
width: clientWidth + addClient,
height: clientHeight + addClient,
scale: options?.scale ?? 3,
copyDefaultStyles: false,
});
if (url) {
dataUrl = url;
break;
}
}

return options?.rotate ? kitRotationImage(dataUrl) : dataUrl;
};
Expand Down
10 changes: 4 additions & 6 deletions projects/kit/src/lib/utils/ionic-scroll-event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ export const kitChangeEventDisabled = (
completeEvent: WritableSignal<HTMLIonInfiniteScrollElement | HTMLIonRefresherElement | null | undefined>,
disabled: boolean,
): void => {
completeEvent.update((event) => {
if (event) {
event.disabled = disabled;
}
return event;
});
const event = completeEvent();
if (event) {
event.disabled = disabled;
}
};