From 0c51dc44df532a4b47d35814fa9b9665cb9b8ca9 Mon Sep 17 00:00:00 2001 From: muerwre Date: Thu, 6 Dec 2018 11:51:01 +0700 Subject: [PATCH] renderer: disabled rendering of empty text --- src/modules/Sticker.js | 2 ++ src/utils/renderer.js | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/Sticker.js b/src/modules/Sticker.js index 3f49231..942e00b 100644 --- a/src/modules/Sticker.js +++ b/src/modules/Sticker.js @@ -116,6 +116,8 @@ export class Sticker { onDragStop = e => { this.preventPropagations(e); + if (!this.marker) return; + this.triggerOnChange(); this.isDragging = false; this.marker.enableEdit(); diff --git a/src/utils/renderer.js b/src/utils/renderer.js index 29659fc..7e09f12 100644 --- a/src/utils/renderer.js +++ b/src/utils/renderer.js @@ -185,6 +185,7 @@ const measureRect = (x, y, width, height, reversed) => ({ rectH: height + 20, textX: reversed ? (x - width - 36) : x + 36 }); + const composeStickerText = (ctx, x, y, angle, text) => { const rad = 56; const tX = ((Math.cos(angle + Math.PI) * rad) - 30) + x + 28; @@ -228,10 +229,7 @@ const composeStickerImage = async (ctx, x, y, angle, set, sticker) => { const tY = ((Math.sin(angle + Math.PI) * rad) - 30) + y - 4; const offsetX = STICKERS[set].layers[sticker].off * 72; - console.log(STICKERS[set].url); - return imageFetcher(STICKERS[set].url).then(image => ( - // ctx.drawImage(image, 0, 0, 72, 72, 100, 100, 72, 72) ctx.drawImage(image, offsetX, 0, 72, 72, tX, tY, 72, 72) )); @@ -242,7 +240,8 @@ export const composeStickers = async ({ stickers, ctx }) => { stickers.map(({ x, y, angle, text }) => { composeStickerArrow(ctx, x, y, angle); - composeStickerText(ctx, x, y, angle, text); + + if (text) composeStickerText(ctx, x, y, angle, text); }); await Promise.all(stickers.map(({