lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-12-21 11:14:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:konvajs/konva

Browse Source
This commit is contained in:
Anton Lavrenov
2020-05-13 09:23:31 -05:00
parent 234e1e3729 57a436ae98
commit 6cc3224769
4 changed files with 16871 additions and 16913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
konva.js
View File

@@ -8,7 +8,7 @@
* Konva JavaScript Framework v6.0.0
* http://konvajs.org/
* Licensed under the MIT
* Date: Fri May 08 2020
* Date: Wed May 13 2020
*
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
* Modified work Copyright (C) 2014 - present by Anton Lavrenov (Konva)
@@ -3307,44 +3307,33 @@
}
};
/**
* determine if node is visible by taking into account ancestors.
*
* Parent | Self | isVisible
* visible | visible |
* ----------+-----------+------------
* T | T | T
* T | F | F
* F | T | T
* F | F | F
* ----------+-----------+------------
* T | I | T
* F | I | F
* I | I | T
* @method
* @name Konva.Node#isVisible
* @returns {Boolean}
*/
* determine if node is visible by taking into account ancestors.
*
* Parent | Self | isVisible
* visible | visible |
* ----------+-----------+------------
* T | T | T
* T | F | F
* F | T | F
* F | F | F
* @method
* @name Konva.Node#isVisible
* @returns {Boolean}
*/
Node.prototype.isVisible = function () {
return this._getCache(VISIBLE, this._isVisible);
};
Node.prototype._isVisible = function (relativeTo) {
var visible = this.visible(), parent = this.getParent();
// the following conditions are a simplification of the truth table above.
// please modify carefully
if (visible === 'inherit') {
if (parent && parent !== relativeTo) {
return parent._isVisible(relativeTo);
}
else {
return true;
}
var visible = this.visible();
if (!visible) {
return false;
}
else if (relativeTo && relativeTo !== parent) {
return visible && parent._isVisible(relativeTo);
var parent = this.getParent();
if (parent && parent !== relativeTo) {
return parent._isVisible(relativeTo);
}
else {
return visible;
return true;
}
};
/**
@@ -5056,22 +5045,15 @@
* Konva.Filters.Invert
* ]);
*/
Factory.addGetterSetter(Node, 'visible', 'inherit', function (val) {
var isValid = val === true || val === false || val === 'inherit';
if (!isValid) {
Util.warn(val +
' is a not valid value for "visible" attribute. The value may be true, false or "inherit".');
}
return val;
});
Factory.addGetterSetter(Node, 'visible', true, getBooleanValidator());
/**
* get/set visible attr. Can be "inherit", true, or false. The default is "inherit".
* get/set visible attr. Can be true, or false. The default is true.
* If you need to determine if a node is visible or not
* by taking into account its parents, use the isVisible() method
* @name Konva.Node#visible
* @method
* @param {Boolean|String} visible
* @returns {Boolean|String}
* @param {Boolean} visible
* @returns {Boolean}
* @example
* // get visible attr
* var visible = node.visible();
@@ -5079,11 +5061,9 @@
* // make invisible
* node.visible(false);
*
* // make visible
* // make visible (according to the parent)
* node.visible(true);
*
* // make visible according to the parent
* node.visible('inherit');
*/
Factory.addGetterSetter(Node, 'transformsEnabled', 'all', getStringValidator());
/**
@@ -11076,12 +11056,12 @@
Image.prototype.getWidth = function () {
var _a;
var image = this.image();
return (_a = this.attrs.width) !== null && _a !== void 0 ? _a : (image ? image.width : 0);
return _a = this.attrs.width, (_a !== null && _a !== void 0 ? _a : (image ? image.width : 0));
};
Image.prototype.getHeight = function () {
var _a;
var image = this.image();
return (_a = this.attrs.height) !== null && _a !== void 0 ? _a : (image ? image.height : 0);
return _a = this.attrs.height, (_a !== null && _a !== void 0 ? _a : (image ? image.height : 0));
};
/**
* load image from given url and create `Konva.Image` instance

4
konva.min.js vendored
View File

File diff suppressed because one or more lines are too long

74
src/Node.ts
View File

@@ -1016,43 +1016,32 @@ export abstract class Node<Config extends NodeConfig = NodeConfig> {
}
}
/**
* determine if node is visible by taking into account ancestors.
*
* Parent | Self | isVisible
* visible | visible |
* ----------+-----------+------------
* T | T | T
* T | F | F
* F | T | T
* F | F | F
* ----------+-----------+------------
* T | I | T
* F | I | F
* I | I | T
* @method
* @name Konva.Node#isVisible
* @returns {Boolean}
*/
* determine if node is visible by taking into account ancestors.
*
* Parent | Self | isVisible
* visible | visible |
* ----------+-----------+------------
* T | T | T
* T | F | F
* F | T | F
* F | F | F
* @method
* @name Konva.Node#isVisible
* @returns {Boolean}
*/
isVisible() {
return this._getCache(VISIBLE, this._isVisible);
}
_isVisible(relativeTo) {
var visible = this.visible(),
parent = this.getParent();
// the following conditions are a simplification of the truth table above.
// please modify carefully
if (visible === 'inherit') {
if (parent && parent !== relativeTo) {
return parent._isVisible(relativeTo);
} else {
return true;
}
} else if (relativeTo && relativeTo !== parent) {
return visible && parent._isVisible(relativeTo);
const visible = this.visible();
if (!visible) {
return false;
}
const parent = this.getParent();
if (parent && parent !== relativeTo) {
return parent._isVisible(relativeTo);
} else {
return visible;
return true;
}
}
/**
@@ -3040,24 +3029,15 @@ Factory.addGetterSetter(Node, 'filters', null, function (val) {
* ]);
*/
Factory.addGetterSetter(Node, 'visible', 'inherit', function (val) {
var isValid = val === true || val === false || val === 'inherit';
if (!isValid) {
Util.warn(
val +
' is a not valid value for "visible" attribute. The value may be true, false or "inherit".'
);
}
return val;
});
Factory.addGetterSetter(Node, 'visible', true, getBooleanValidator());
/**
* get/set visible attr. Can be "inherit", true, or false. The default is "inherit".
* get/set visible attr. Can be true, or false. The default is true.
* If you need to determine if a node is visible or not
* by taking into account its parents, use the isVisible() method
* @name Konva.Node#visible
* @method
* @param {Boolean|String} visible
* @returns {Boolean|String}
* @param {Boolean} visible
* @returns {Boolean}
* @example
* // get visible attr
* var visible = node.visible();
@@ -3065,11 +3045,9 @@ Factory.addGetterSetter(Node, 'visible', 'inherit', function (val) {
* // make invisible
* node.visible(false);
*
* // make visible
* // make visible (according to the parent)
* node.visible(true);
*
* // make visible according to the parent
* node.visible('inherit');
*/
Factory.addGetterSetter(Node, 'transformsEnabled', 'all', getStringValidator());

10
test/unit/Node-test.js
View File

@@ -3202,35 +3202,35 @@ suite('Node', function () {
assert.equal(layer.isVisible(), false);
assert.equal(circle.isVisible(), false);
stage.setVisible('inherit');
stage.setVisible(true);
layer.setVisible(false);
assert.equal(stage.isVisible(), true);
assert.equal(layer.isVisible(), false);
assert.equal(circle.isVisible(), false);
layer.setVisible('inherit');
layer.setVisible(true);
circle.setVisible(false);
assert.equal(stage.isVisible(), true);
assert.equal(layer.isVisible(), true);
assert.equal(circle.isVisible(), false);
circle.setVisible('inherit');
circle.setVisible(true);
stage.setVisible(true);
assert.equal(stage.isVisible(), true);
assert.equal(layer.isVisible(), true);
assert.equal(circle.isVisible(), true);
stage.setVisible('inherit');
stage.setVisible(true);
layer.setVisible(true);
assert.equal(stage.isVisible(), true);
assert.equal(layer.isVisible(), true);
assert.equal(circle.isVisible(), true);
layer.setVisible('inherit');
layer.setVisible(true);
circle.setVisible(true);
assert.equal(stage.isVisible(), true);