Skip to content
Open
Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion src/core/dom-renderer/domRendererTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ export interface IRendererMain extends IEventEmitter {
createNode(props: Partial<IRendererNodeProps>): IRendererNode;
createShader: typeof lng.RendererMain.prototype.createShader;
createTexture: typeof lng.RendererMain.prototype.createTexture;
//createEffect: typeof lng.RendererMain.prototype.createEffect;
}

export interface DomRendererMainSettings {
Expand Down
13 changes: 8 additions & 5 deletions src/core/elementNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const parseAndAssignShaderProps = (

props[actualPrefix] = obj;
Object.entries(obj).forEach(([key, value]) => {
let transformedKey = key === 'width' ? 'w' : key;
let transformedKey = getPropertyAlias(key);

// If border side and key is width/w, transform to side (bottom/left/right/top)
if (side && transformedKey === 'w') {
Expand All @@ -138,8 +138,8 @@ export function convertToShader(
}

function getPropertyAlias(name: string) {
if (name === 'w') return 'width';
if (name === 'h') return 'height';
if (name === 'width') return 'w';
if (name === 'height') return 'h';
return name;
}

Expand Down Expand Up @@ -1006,8 +1006,11 @@ export class ElementNode extends Object {
focusQueued = true;
queueMicrotask(() => {
focusQueued = false;
if (nextActiveElement) setActiveElement(nextActiveElement);
nextActiveElement = null;
if (nextActiveElement) {
const element = nextActiveElement;
nextActiveElement = null;
setActiveElement(element);
}
});
}
} else {
Expand Down