jprdonnelly/pyscript
1
0
Fork 0
mirror of https://github.com/pyscript/pyscript.git synced 2025-12-20 02:37:41 -05:00
Code Issues Projects Releases Wiki Activity

Unwind async/await chains (#957)

Browse Source 
*Cleanup several spots where runtime.run() no longer needs to be awaited, now that #928 is merged.
This commit is contained in:
Jeff Glass
2022-11-16 13:42:40 -06:00
committed by GitHub
parent 0b23310a06
commit 7e24289703
7 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pyscriptjs/src/components/pyscript.ts
View File

@@ -134,15 +134,15 @@ const pyAttributeToEvent: Map<string, string> = new Map<string, string>([
]);
/** Initialize all elements with py-* handlers attributes */
export async function initHandlers(runtime: Runtime) {
export function initHandlers(runtime: Runtime) {
logger.debug('Initializing py-* event handlers...');
for (const pyAttribute of pyAttributeToEvent.keys()) {
await createElementsWithEventListeners(runtime, pyAttribute);
createElementsWithEventListeners(runtime, pyAttribute);
}
}
/** Initializes an element with the given py-on* attribute and its handler */
async function createElementsWithEventListeners(runtime: Runtime, pyAttribute: string): Promise<void> {
function createElementsWithEventListeners(runtime: Runtime, pyAttribute: string) {
const matches: NodeListOf<HTMLElement> = document.querySelectorAll(`[${pyAttribute}]`);
for (const el of matches) {
if (el.id.length === 0) {
@@ -161,12 +161,10 @@ async function createElementsWithEventListeners(runtime: Runtime, pyAttribute: s
from pyodide.ffi import create_proxy
Element("${el.id}").element.addEventListener("${event}", create_proxy(${handlerCode}))
`;
await runtime.run(source);
runtime.run(source);
} else {
el.addEventListener(event, () => {
(async () => {
await runtime.run(handlerCode);
})();
runtime.run(handlerCode);
});
}
// TODO: Should we actually map handlers in JS instead of Python?
@@ -186,7 +184,7 @@ async function createElementsWithEventListeners(runtime: Runtime, pyAttribute: s
}
/** Mount all elements with attribute py-mount into the Python namespace */
export async function mountElements(runtime: Runtime) {
export function mountElements(runtime: Runtime) {
const matches: NodeListOf<HTMLElement> = document.querySelectorAll('[py-mount]');
logger.info(`py-mount: found ${matches.length} elements`);
@@ -195,5 +193,5 @@ export async function mountElements(runtime: Runtime) {
const mountName = el.getAttribute('py-mount') || el.id.split('-').join('_');
source += `\n${mountName} = Element("${el.id}")`;
}
await runtime.run(source);
runtime.run(source);
}