Skip to content
Merged
Changes from all commits
Commits
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
65 changes: 34 additions & 31 deletions src/core/elementNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,15 @@ function buildFontTemplate() {
_fontTemplate = tpl;
}

const EFFECT_SHADER_KEYS = [
'border',
'borderTop',
'borderRight',
'borderBottom',
'borderLeft',
'shadow',
] as const satisfies ReadonlyArray<keyof StyleEffects>;

const parseAndAssignShaderProps = (
prefix: string,
obj: Record<string, unknown>,
Expand Down Expand Up @@ -215,7 +224,7 @@ function getPropertyAlias(name: string) {
return name;
}

export const LightningRendererNumberProps = [
const LightningRendererNumberProps = [
'alpha',
'color',
'colorTop',
Expand Down Expand Up @@ -820,28 +829,16 @@ export class ElementNode {
return this.lng.shader;
}

set effects(v: StyleEffects) {
if (!SHADERS_ENABLED) return;
let target = this.lng.shader || {};
if (this.lng.shader?.props) {
target = this.lng.shader.props;
}
if (v.rounded) target.radius = v.rounded.radius;
if (v.borderRadius) target.radius = v.borderRadius;
if (v.border) parseAndAssignShaderProps('border', v.border, target);
if (v.borderTop)
parseAndAssignShaderProps('borderTop', v.borderTop, target);
if (v.borderRight)
parseAndAssignShaderProps('borderRight', v.borderRight, target);
if (v.borderBottom)
parseAndAssignShaderProps('borderBottom', v.borderBottom, target);
if (v.borderLeft)
parseAndAssignShaderProps('borderLeft', v.borderLeft, target);
if (v.shadow) parseAndAssignShaderProps('shadow', v.shadow, target);

/**
* Commit a built shader-props target back to `this.lng.shader`. When the
* node is already rendered we either convert the props into a real shader
* (first time) or self-assign so the DOM renderer's setter reapplies style;
* pre-render we just attach the bag for the upcoming `render()`.
*/
_writeShaderTarget(target: unknown) {
if (this.rendered) {
if (!this.lng.shader) {
this.lng.shader = Config.convertToShader(this, target);
this.lng.shader = Config.convertToShader(this, target as StyleEffects);
} else if (isDomRendererActive()) {
// eslint-disable-next-line no-self-assign -- lng.shader is a setter, force style update
this.lng.shader = this.lng.shader;
Expand All @@ -851,6 +848,21 @@ export class ElementNode {
}
}

set effects(v: StyleEffects) {
if (!SHADERS_ENABLED) return;
let target = this.lng.shader || {};
if (this.lng.shader?.props) {
target = this.lng.shader.props;
}
if (v.rounded) target.radius = v.rounded.radius;
if (v.borderRadius) target.radius = v.borderRadius;
for (const k of EFFECT_SHADER_KEYS) {
if (v[k]) parseAndAssignShaderProps(k, v[k], target);
}

this._writeShaderTarget(target);
}

set id(id: string) {
this._id = id;
if (
Expand Down Expand Up @@ -1796,16 +1808,7 @@ export function shaderAccessor<T extends Record<string, any> | number>(
parseAndAssignShaderProps(key, value, target);
}

if (this.rendered) {
if (!this.lng.shader) {
this.lng.shader = Config.convertToShader(this, target);
} else if (isDomRendererActive()) {
// eslint-disable-next-line no-self-assign -- lng.shader is a setter, force style update
this.lng.shader = this.lng.shader;
}
} else {
this.lng.shader = target;
}
this._writeShaderTarget(target);

if (animationSettings) {
this.animate({ shaderProps: target }, animationSettings).start();
Expand Down
Loading