mirror of
https://github.com/google/blockly.git
synced 2026-05-13 07:30:10 +02:00
29e1f0cb03
* fix: relative path for deprecation utils * fix: checking if properties exist in svg_math * fix: set all timeout PIDs to AnyDuringMigration * fix: make nullability errors explicity in block drag surface * fix: make null check in events_block_change explicit * fix: make getEventWorkspace_ internal so we can access it from CommentCreateDeleteHelper * fix: rename DIV -> containerDiv in tooltip * fix: ignore backwards compat check in category * fix: set block styles to AnyDuringMigration * fix: type typo in KeyboardShortcut * fix: constants name in row measurables * fix: typecast in mutator * fix: populateProcedures type of flattened array * fix: ignore errors related to workspace comment deserialization * chore: format files * fix: renaming imports missing file extensions * fix: remove check for sound.play * fix: temporarily remove bad requireType. All `export type` statements are stripped when tsc is run. This means that when we attempt to require BlockDefinition from the block files, we get an error because it does not exist. We decided to temporarily remove the require, because this will no longer be a problem when we conver the blocks to typescript, and everything gets compiled together. * fix: bad jsdoc in array * fix: silence missing property errors Closure was complaining about inexistant properties, but they actually do exist, they're just not being transpiled by tsc in a way that closure understands. I.E. if things are initialized in a function called by the constructor, rather than in a class field or in the custructor itself, closure would error. It would also error on enums, because they are transpiled to a weird IIFE. * fix: context menu action handler not knowing the type of this. this: TypeX information gets stripped when tsc is run, so closure could not know that this was not global. Fixed this by reorganizing to use the option object directly instead of passing it to onAction to be bound to this. * fix: readd getDeveloperVars checks (should not be part of migration) This was found because ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE was no longer being accessed. * fix: silence closure errors about overriding supertype props We propertly define the overrides in typescript, but these get removed from the compiled output, so closure doesn't know they exist. * fix: silence globalThis errors this: TypeX annotations get stripped from the compiled output, so closure can't know that we're accessing the correct things. However, typescript makes sure that this always has the correct properties, so silencing this should be fine. * fix: bad jsdoc name * chore: attempt compiling with blockly.js * fix: attempt moving the import statement above the namespace line * chore: add todo comments to block def files * chore: remove todo from context menu * chore: add comments abotu disabled errors
129 lines
3.6 KiB
TypeScript
129 lines
3.6 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2019 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Geras renderer.
|
|
*/
|
|
|
|
/**
|
|
* Geras renderer.
|
|
* @class
|
|
*/
|
|
import * as goog from '../../../closure/goog/goog.js';
|
|
goog.declareModuleId('Blockly.geras.Renderer');
|
|
|
|
/* eslint-disable-next-line no-unused-vars */
|
|
// Unused import preserved for side-effects. Remove if unneeded.
|
|
import '../common/constants.js';
|
|
|
|
/* eslint-disable-next-line no-unused-vars */
|
|
import {BlockSvg} from '../../block_svg.js';
|
|
import {BlockStyle, Theme} from '../../theme.js';
|
|
import * as blockRendering from '../common/block_rendering.js';
|
|
/* eslint-disable-next-line no-unused-vars */
|
|
import {RenderInfo as BaseRenderInfo} from '../common/info.js';
|
|
import {Renderer as BaseRenderer} from '../common/renderer.js';
|
|
|
|
import {ConstantProvider} from './constants.js';
|
|
import {Drawer} from './drawer.js';
|
|
import {HighlightConstantProvider} from './highlight_constants.js';
|
|
import {RenderInfo} from './info.js';
|
|
import {PathObject} from './path_object.js';
|
|
|
|
|
|
/**
|
|
* The geras renderer.
|
|
* @alias Blockly.geras.Renderer
|
|
*/
|
|
export class Renderer extends BaseRenderer {
|
|
/** The renderer's highlight constant provider. */
|
|
// AnyDuringMigration because: Type 'null' is not assignable to type
|
|
// 'HighlightConstantProvider'.
|
|
private highlightConstants_: HighlightConstantProvider =
|
|
null as AnyDuringMigration;
|
|
|
|
/**
|
|
* @param name The renderer name.
|
|
* @internal
|
|
*/
|
|
constructor(name: string) {
|
|
super(name);
|
|
}
|
|
|
|
/**
|
|
* Initialize the renderer. Geras has a highlight provider in addition to
|
|
* the normal constant provider.
|
|
* @internal
|
|
*/
|
|
override init(theme: Theme, opt_rendererOverrides: AnyDuringMigration) {
|
|
super.init(theme, opt_rendererOverrides);
|
|
this.highlightConstants_ = this.makeHighlightConstants_();
|
|
this.highlightConstants_.init();
|
|
}
|
|
|
|
override refreshDom(svg: SVGElement, theme: Theme) {
|
|
super.refreshDom(svg, theme);
|
|
this.getHighlightConstants().init();
|
|
}
|
|
|
|
override makeConstants_() {
|
|
return new ConstantProvider();
|
|
}
|
|
|
|
/**
|
|
* Create a new instance of the renderer's render info object.
|
|
* @param block The block to measure.
|
|
* @return The render info object.
|
|
*/
|
|
protected override makeRenderInfo_(block: BlockSvg): RenderInfo {
|
|
return new RenderInfo(this, block);
|
|
}
|
|
|
|
/**
|
|
* Create a new instance of the renderer's drawer.
|
|
* @param block The block to render.
|
|
* @param info An object containing all information needed to render this
|
|
* block.
|
|
* @return The drawer.
|
|
*/
|
|
protected override makeDrawer_(block: BlockSvg, info: BaseRenderInfo):
|
|
Drawer {
|
|
return new Drawer(block, (info as RenderInfo));
|
|
}
|
|
|
|
/**
|
|
* Create a new instance of a renderer path object.
|
|
* @param root The root SVG element.
|
|
* @param style The style object to use for colouring.
|
|
* @return The renderer path object.
|
|
* @internal
|
|
*/
|
|
override makePathObject(root: SVGElement, style: BlockStyle): PathObject {
|
|
return new PathObject(
|
|
root, style, (this.getConstants() as ConstantProvider));
|
|
}
|
|
|
|
/**
|
|
* Create a new instance of the renderer's highlight constant provider.
|
|
* @return The highlight constant provider.
|
|
*/
|
|
protected makeHighlightConstants_(): HighlightConstantProvider {
|
|
return new HighlightConstantProvider((this.getConstants()));
|
|
}
|
|
|
|
/**
|
|
* Get the renderer's highlight constant provider. We assume that when this
|
|
* is called, the renderer has already been initialized.
|
|
* @return The highlight constant provider.
|
|
* @internal
|
|
*/
|
|
getHighlightConstants(): HighlightConstantProvider {
|
|
return this.highlightConstants_;
|
|
}
|
|
}
|
|
|
|
blockRendering.register('geras', Renderer);
|