mirror of
https://github.com/google/blockly.git
synced 2026-01-09 18:10:08 +01:00
Split classes from core/renderers/measurables/inputs.js
This commit is contained in:
kozbial
Monica Kozbial
53
core/renderers/measurables/external_value_input.js
Normal file
53
core/renderers/measurables/external_value_input.js
Normal file
@@ -0,0 +1,53 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright 2019 Google LLC
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* @fileoverview Class representing external value inputs with connections on a
|
||||
* rendered block.
|
||||
* @author fenichel@google.com (Rachel Fenichel)
|
||||
*/
|
||||
|
||||
goog.provide('Blockly.blockRendering.ExternalValueInput');
|
||||
|
||||
goog.require('Blockly.blockRendering.InputConnection');
|
||||
goog.require('Blockly.blockRendering.Types');
|
||||
goog.require('Blockly.utils.object');
|
||||
|
||||
goog.requireType('Blockly.blockRendering.ConstantProvider');
|
||||
goog.requireType('Blockly.Input');
|
||||
|
||||
|
||||
/**
|
||||
* An object containing information about the space an external value input
|
||||
* takes up during rendering
|
||||
* @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
|
||||
* constants provider.
|
||||
* @param {!Blockly.Input} input The external value input to measure and store
|
||||
* information for.
|
||||
* @package
|
||||
* @constructor
|
||||
* @extends {Blockly.blockRendering.InputConnection}
|
||||
*/
|
||||
Blockly.blockRendering.ExternalValueInput = function(constants, input) {
|
||||
Blockly.blockRendering.ExternalValueInput.superClass_.constructor.call(this,
|
||||
constants, input);
|
||||
this.type |= Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
|
||||
if (!this.connectedBlock) {
|
||||
this.height = this.shape.height;
|
||||
} else {
|
||||
this.height =
|
||||
this.connectedBlockHeight - this.constants_.TAB_OFFSET_FROM_TOP -
|
||||
this.constants_.MEDIUM_PADDING;
|
||||
}
|
||||
this.width = this.shape.width +
|
||||
this.constants_.EXTERNAL_VALUE_INPUT_PADDING;
|
||||
|
||||
this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
|
||||
this.connectionHeight = this.shape.height;
|
||||
this.connectionWidth = this.shape.width;
|
||||
};
|
||||
Blockly.utils.object.inherits(Blockly.blockRendering.ExternalValueInput,
|
||||
Blockly.blockRendering.InputConnection);
|
||||
63
core/renderers/measurables/inline_input.js
Normal file
63
core/renderers/measurables/inline_input.js
Normal file
@@ -0,0 +1,63 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright 2019 Google LLC
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* @fileoverview Class representing inline inputs with connections on a rendered
|
||||
* block.
|
||||
* @author fenichel@google.com (Rachel Fenichel)
|
||||
*/
|
||||
|
||||
goog.provide('Blockly.blockRendering.InlineInput');
|
||||
|
||||
goog.require('Blockly.blockRendering.InputConnection');
|
||||
goog.require('Blockly.blockRendering.Types');
|
||||
goog.require('Blockly.utils.object');
|
||||
|
||||
goog.requireType('Blockly.blockRendering.ConstantProvider');
|
||||
goog.requireType('Blockly.Input');
|
||||
|
||||
|
||||
/**
|
||||
* An object containing information about the space an inline input takes up
|
||||
* during rendering
|
||||
* @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
|
||||
* constants provider.
|
||||
* @param {!Blockly.Input} input The inline input to measure and store
|
||||
* information for.
|
||||
* @package
|
||||
* @constructor
|
||||
* @extends {Blockly.blockRendering.InputConnection}
|
||||
*/
|
||||
Blockly.blockRendering.InlineInput = function(constants, input) {
|
||||
Blockly.blockRendering.InlineInput.superClass_.constructor.call(this,
|
||||
constants, input);
|
||||
this.type |= Blockly.blockRendering.Types.INLINE_INPUT;
|
||||
|
||||
if (!this.connectedBlock) {
|
||||
this.height = this.constants_.EMPTY_INLINE_INPUT_HEIGHT;
|
||||
this.width = this.constants_.EMPTY_INLINE_INPUT_PADDING;
|
||||
} else {
|
||||
// We allow the dark path to show on the parent block so that the child
|
||||
// block looks embossed. This takes up an extra pixel in both x and y.
|
||||
this.width = this.connectedBlockWidth;
|
||||
this.height = this.connectedBlockHeight;
|
||||
}
|
||||
|
||||
this.connectionHeight = !this.isDynamicShape ? this.shape.height :
|
||||
this.shape.height(this.height);
|
||||
this.connectionWidth = !this.isDynamicShape ? this.shape.width :
|
||||
this.shape.width(this.height);
|
||||
if (!this.connectedBlock) {
|
||||
this.width += this.connectionWidth * (this.isDynamicShape ? 2 : 1);
|
||||
}
|
||||
this.connectionOffsetY = this.isDynamicShape ?
|
||||
this.shape.connectionOffsetY(this.connectionHeight) :
|
||||
this.constants_.TAB_OFFSET_FROM_TOP;
|
||||
this.connectionOffsetX = this.isDynamicShape ?
|
||||
this.shape.connectionOffsetX(this.connectionWidth) : 0;
|
||||
};
|
||||
Blockly.utils.object.inherits(Blockly.blockRendering.InlineInput,
|
||||
Blockly.blockRendering.InputConnection);
|
||||
55
core/renderers/measurables/input_connection.js
Normal file
55
core/renderers/measurables/input_connection.js
Normal file
@@ -0,0 +1,55 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright 2019 Google LLC
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* @fileoverview Class representing inputs with connections on a rendered block.
|
||||
* @author fenichel@google.com (Rachel Fenichel)
|
||||
*/
|
||||
|
||||
goog.provide('Blockly.blockRendering.InputConnection');
|
||||
|
||||
goog.require('Blockly.blockRendering.Connection');
|
||||
goog.require('Blockly.blockRendering.Types');
|
||||
goog.require('Blockly.utils.object');
|
||||
|
||||
goog.requireType('Blockly.blockRendering.ConstantProvider');
|
||||
goog.requireType('Blockly.Input');
|
||||
|
||||
|
||||
/**
|
||||
* The base class to represent an input that takes up space on a block
|
||||
* during rendering
|
||||
* @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
|
||||
* constants provider.
|
||||
* @param {!Blockly.Input} input The input to measure and store information for.
|
||||
* @package
|
||||
* @constructor
|
||||
* @extends {Blockly.blockRendering.Connection}
|
||||
*/
|
||||
Blockly.blockRendering.InputConnection = function(constants, input) {
|
||||
Blockly.blockRendering.InputConnection.superClass_.constructor.call(this,
|
||||
constants, input.connection);
|
||||
|
||||
this.type |= Blockly.blockRendering.Types.INPUT;
|
||||
this.input = input;
|
||||
this.align = input.align;
|
||||
this.connectedBlock = input.connection && input.connection.targetBlock() ?
|
||||
input.connection.targetBlock() : null;
|
||||
|
||||
if (this.connectedBlock) {
|
||||
var bBox = this.connectedBlock.getHeightWidth();
|
||||
this.connectedBlockWidth = bBox.width;
|
||||
this.connectedBlockHeight = bBox.height;
|
||||
} else {
|
||||
this.connectedBlockWidth = 0;
|
||||
this.connectedBlockHeight = 0;
|
||||
}
|
||||
|
||||
this.connectionOffsetX = 0;
|
||||
this.connectionOffsetY = 0;
|
||||
};
|
||||
Blockly.utils.object.inherits(Blockly.blockRendering.InputConnection,
|
||||
Blockly.blockRendering.Connection);
|
||||
@@ -1,162 +0,0 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright 2019 Google LLC
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* @fileoverview Objects representing inputs with connections on a rendered
|
||||
* block.
|
||||
* @author fenichel@google.com (Rachel Fenichel)
|
||||
*/
|
||||
|
||||
goog.provide('Blockly.blockRendering.ExternalValueInput');
|
||||
goog.provide('Blockly.blockRendering.InlineInput');
|
||||
goog.provide('Blockly.blockRendering.InputConnection');
|
||||
goog.provide('Blockly.blockRendering.StatementInput');
|
||||
|
||||
goog.require('Blockly.blockRendering.Connection');
|
||||
goog.require('Blockly.blockRendering.Types');
|
||||
goog.require('Blockly.utils.object');
|
||||
|
||||
goog.requireType('Blockly.blockRendering.ConstantProvider');
|
||||
goog.requireType('Blockly.Input');
|
||||
|
||||
|
||||
/**
|
||||
* The base class to represent an input that takes up space on a block
|
||||
* during rendering
|
||||
* @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
|
||||
* constants provider.
|
||||
* @param {!Blockly.Input} input The input to measure and store information for.
|
||||
* @package
|
||||
* @constructor
|
||||
* @extends {Blockly.blockRendering.Connection}
|
||||
*/
|
||||
Blockly.blockRendering.InputConnection = function(constants, input) {
|
||||
Blockly.blockRendering.InputConnection.superClass_.constructor.call(this,
|
||||
constants, input.connection);
|
||||
|
||||
this.type |= Blockly.blockRendering.Types.INPUT;
|
||||
this.input = input;
|
||||
this.align = input.align;
|
||||
this.connectedBlock = input.connection && input.connection.targetBlock() ?
|
||||
input.connection.targetBlock() : null;
|
||||
|
||||
if (this.connectedBlock) {
|
||||
var bBox = this.connectedBlock.getHeightWidth();
|
||||
this.connectedBlockWidth = bBox.width;
|
||||
this.connectedBlockHeight = bBox.height;
|
||||
} else {
|
||||
this.connectedBlockWidth = 0;
|
||||
this.connectedBlockHeight = 0;
|
||||
}
|
||||
|
||||
this.connectionOffsetX = 0;
|
||||
this.connectionOffsetY = 0;
|
||||
};
|
||||
Blockly.utils.object.inherits(Blockly.blockRendering.InputConnection,
|
||||
Blockly.blockRendering.Connection);
|
||||
|
||||
/**
|
||||
* An object containing information about the space an inline input takes up
|
||||
* during rendering
|
||||
* @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
|
||||
* constants provider.
|
||||
* @param {!Blockly.Input} input The inline input to measure and store
|
||||
* information for.
|
||||
* @package
|
||||
* @constructor
|
||||
* @extends {Blockly.blockRendering.InputConnection}
|
||||
*/
|
||||
Blockly.blockRendering.InlineInput = function(constants, input) {
|
||||
Blockly.blockRendering.InlineInput.superClass_.constructor.call(this,
|
||||
constants, input);
|
||||
this.type |= Blockly.blockRendering.Types.INLINE_INPUT;
|
||||
|
||||
if (!this.connectedBlock) {
|
||||
this.height = this.constants_.EMPTY_INLINE_INPUT_HEIGHT;
|
||||
this.width = this.constants_.EMPTY_INLINE_INPUT_PADDING;
|
||||
} else {
|
||||
// We allow the dark path to show on the parent block so that the child
|
||||
// block looks embossed. This takes up an extra pixel in both x and y.
|
||||
this.width = this.connectedBlockWidth;
|
||||
this.height = this.connectedBlockHeight;
|
||||
}
|
||||
|
||||
this.connectionHeight = !this.isDynamicShape ? this.shape.height :
|
||||
this.shape.height(this.height);
|
||||
this.connectionWidth = !this.isDynamicShape ? this.shape.width :
|
||||
this.shape.width(this.height);
|
||||
if (!this.connectedBlock) {
|
||||
this.width += this.connectionWidth * (this.isDynamicShape ? 2 : 1);
|
||||
}
|
||||
this.connectionOffsetY = this.isDynamicShape ?
|
||||
this.shape.connectionOffsetY(this.connectionHeight) :
|
||||
this.constants_.TAB_OFFSET_FROM_TOP;
|
||||
this.connectionOffsetX = this.isDynamicShape ?
|
||||
this.shape.connectionOffsetX(this.connectionWidth) : 0;
|
||||
};
|
||||
Blockly.utils.object.inherits(Blockly.blockRendering.InlineInput,
|
||||
Blockly.blockRendering.InputConnection);
|
||||
|
||||
/**
|
||||
* An object containing information about the space a statement input takes up
|
||||
* during rendering
|
||||
* @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
|
||||
* constants provider.
|
||||
* @param {!Blockly.Input} input The statement input to measure and store
|
||||
* information for.
|
||||
* @package
|
||||
* @constructor
|
||||
* @extends {Blockly.blockRendering.InputConnection}
|
||||
*/
|
||||
Blockly.blockRendering.StatementInput = function(constants, input) {
|
||||
Blockly.blockRendering.StatementInput.superClass_.constructor.call(this,
|
||||
constants, input);
|
||||
this.type |= Blockly.blockRendering.Types.STATEMENT_INPUT;
|
||||
|
||||
if (!this.connectedBlock) {
|
||||
this.height = this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT;
|
||||
} else {
|
||||
// We allow the dark path to show on the parent block so that the child
|
||||
// block looks embossed. This takes up an extra pixel in both x and y.
|
||||
this.height =
|
||||
this.connectedBlockHeight + this.constants_.STATEMENT_BOTTOM_SPACER;
|
||||
}
|
||||
this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
|
||||
};
|
||||
Blockly.utils.object.inherits(Blockly.blockRendering.StatementInput,
|
||||
Blockly.blockRendering.InputConnection);
|
||||
|
||||
/**
|
||||
* An object containing information about the space an external value input
|
||||
* takes up during rendering
|
||||
* @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
|
||||
* constants provider.
|
||||
* @param {!Blockly.Input} input The external value input to measure and store
|
||||
* information for.
|
||||
* @package
|
||||
* @constructor
|
||||
* @extends {Blockly.blockRendering.InputConnection}
|
||||
*/
|
||||
Blockly.blockRendering.ExternalValueInput = function(constants, input) {
|
||||
Blockly.blockRendering.ExternalValueInput.superClass_.constructor.call(this,
|
||||
constants, input);
|
||||
this.type |= Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
|
||||
if (!this.connectedBlock) {
|
||||
this.height = this.shape.height;
|
||||
} else {
|
||||
this.height =
|
||||
this.connectedBlockHeight - this.constants_.TAB_OFFSET_FROM_TOP -
|
||||
this.constants_.MEDIUM_PADDING;
|
||||
}
|
||||
this.width = this.shape.width +
|
||||
this.constants_.EXTERNAL_VALUE_INPUT_PADDING;
|
||||
|
||||
this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
|
||||
this.connectionHeight = this.shape.height;
|
||||
this.connectionWidth = this.shape.width;
|
||||
};
|
||||
Blockly.utils.object.inherits(Blockly.blockRendering.ExternalValueInput,
|
||||
Blockly.blockRendering.InputConnection);
|
||||
50
core/renderers/measurables/statement_input.js
Normal file
50
core/renderers/measurables/statement_input.js
Normal file
@@ -0,0 +1,50 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright 2019 Google LLC
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* @fileoverview Class representing statement inputs with connections on a
|
||||
* rendered block.
|
||||
* @author fenichel@google.com (Rachel Fenichel)
|
||||
*/
|
||||
|
||||
goog.provide('Blockly.blockRendering.StatementInput');
|
||||
|
||||
goog.require('Blockly.blockRendering.InputConnection');
|
||||
goog.require('Blockly.blockRendering.Types');
|
||||
goog.require('Blockly.utils.object');
|
||||
|
||||
goog.requireType('Blockly.blockRendering.ConstantProvider');
|
||||
goog.requireType('Blockly.Input');
|
||||
|
||||
|
||||
/**
|
||||
* An object containing information about the space a statement input takes up
|
||||
* during rendering
|
||||
* @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
|
||||
* constants provider.
|
||||
* @param {!Blockly.Input} input The statement input to measure and store
|
||||
* information for.
|
||||
* @package
|
||||
* @constructor
|
||||
* @extends {Blockly.blockRendering.InputConnection}
|
||||
*/
|
||||
Blockly.blockRendering.StatementInput = function(constants, input) {
|
||||
Blockly.blockRendering.StatementInput.superClass_.constructor.call(this,
|
||||
constants, input);
|
||||
this.type |= Blockly.blockRendering.Types.STATEMENT_INPUT;
|
||||
|
||||
if (!this.connectedBlock) {
|
||||
this.height = this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT;
|
||||
} else {
|
||||
// We allow the dark path to show on the parent block so that the child
|
||||
// block looks embossed. This takes up an extra pixel in both x and y.
|
||||
this.height =
|
||||
this.connectedBlockHeight + this.constants_.STATEMENT_BOTTOM_SPACER;
|
||||
}
|
||||
this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
|
||||
};
|
||||
Blockly.utils.object.inherits(Blockly.blockRendering.StatementInput,
|
||||
Blockly.blockRendering.InputConnection);
|
||||
@@ -148,9 +148,12 @@ goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.
|
||||
goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
|
||||
goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
|
||||
goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
|
||||
goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
|
||||
goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
|
||||
goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
|
||||
goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
|
||||
goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
|
||||
goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
|
||||
goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
|
||||
goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
|
||||
goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
|
||||
goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
|
||||
|
||||
Reference in New Issue
Block a user