Skip to content
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

Fix/minor ctx indent #54

Merged
merged 2 commits into from
Oct 31, 2024
Merged

Fix/minor ctx indent #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bd9999
fix(config): indent default to space
Salman2301 Oct 31, 2024
c55bfe0
refactor: non-null assertion
Salman2301 Oct 31, 2024
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
4 changes: 2 additions & 2 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
root = true

[*]
indent_style = tab
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
insert_final_newline = true
42 changes: 20 additions & 22 deletions playgrounds/app/src/components/Editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,8 +960,6 @@ function htmlDecode(str: string) {
return txt.value
}

const snippetPadding = 16

async function createAnimationFrame(
elements: MagicMoveElement[],
frame: number,
Expand All @@ -983,7 +981,7 @@ async function createAnimationFrame(
} = config.styling

const canvas = document.createElement('canvas')
const ctx = canvas.getContext('2d', { alpha: false })
const ctx = canvas.getContext('2d', { alpha: false })!
canvas.width = width + xPadding * 2
canvas.height = height + yPadding * 2

Expand All @@ -1002,31 +1000,31 @@ async function createAnimationFrame(
const x2 = w / 2 - (Math.cos(angle) * diagonal) / 2
const y2 = h / 2 - (Math.sin(angle) * diagonal) / 2

const grad = ctx!.createLinearGradient(x1, y1, x2, y2)
const grad = ctx.createLinearGradient(x1, y1, x2, y2)

grad.addColorStop(0, backgroundGradientColorStart)
grad.addColorStop(1, backgroundGradientColorEnd)

ctx!.fillStyle = grad
ctx?.fillRect(0, 0, canvas.width, canvas.height)
ctx.fillStyle = grad
ctx.fillRect(0, 0, canvas.width, canvas.height)
} else {
ctx!.fillStyle = backgroundColor
ctx?.fillRect(0, 0, canvas.width, canvas.height)
ctx.fillStyle = backgroundColor
ctx.fillRect(0, 0, canvas.width, canvas.height)
}

ctx!.fillStyle = snippetBackgroundColor
ctx.fillStyle = snippetBackgroundColor
if (shadowEnabled) {
ctx!.shadowColor = `${shadowColor}${(shadowOpacity * 255).toString(16)}`
ctx!.shadowBlur = shadowBlur
ctx!.shadowOffsetX = 0
ctx!.shadowOffsetY = shadowOffsetY
ctx.shadowColor = `${shadowColor}${(shadowOpacity * 255).toString(16)}`
ctx.shadowBlur = shadowBlur
ctx.shadowOffsetX = 0
ctx.shadowOffsetY = shadowOffsetY
}

ctx!.beginPath()
ctx!.roundRect(xPadding, yPadding, width, height, 4)
ctx!.fill()
ctx.beginPath()
ctx.roundRect(xPadding, yPadding, width, height, 4)
ctx.fill()

ctx!.shadowColor = 'transparent'
ctx.shadowColor = 'transparent'

const xModifier = xPadding
const yModifier = yPadding + parseInt(fontSize)
Expand Down Expand Up @@ -1057,12 +1055,12 @@ async function createAnimationFrame(
[el.color.start || 'rgba(0,0,0,0)', el.color.end || 'rgba(0,0,0,0)'],
)

ctx!.font = `${fontSize} ${fontFamily}`
ctx!.fillStyle = color
ctx!.globalAlpha = opacity
ctx!.fillText(htmlDecode(el.el.innerHTML), x, y, width - x + xPadding / 2)
ctx.font = `${fontSize} ${fontFamily}`
ctx.fillStyle = color
ctx.globalAlpha = opacity
ctx.fillText(htmlDecode(el.el.innerHTML), x, y, width - x + xPadding / 2)
})
await Promise.all(elementPromises)

return ctx!.getImageData(0, 0, canvas.width, canvas.height)
return ctx.getImageData(0, 0, canvas.width, canvas.height)
}
Loading