Skip to content
Closed
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
38 changes: 31 additions & 7 deletions packages/joint-core/src/dia/Paper.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,12 @@ export const Paper = View.extend({
this._setDimensions();
this.startListening();

// Hash of all cell views.
// Hash of all cell views
this._views = {};

// Hash of hidden cell views
this._hiddenViews = new Set();

// Mouse wheel events buffer
this._mw_evt_buffer = {
event: null,
Expand Down Expand Up @@ -1243,7 +1246,7 @@ export const Paper = View.extend({
if ((currentFlag & view.FLAG_REMOVE) === 0) {
// We should never check a view for viewport if we are about to remove the view
var isDetached = cid in updates.unmounted;
if (view.DETACHABLE && viewportFn && !viewportFn.call(this, view, !isDetached, this)) {
if (view.DETACHABLE && (this.isCellViewExplicitlyHidden(view.model) || (viewportFn && !viewportFn.call(this, view, !isDetached, this)))) {
// Unmount View
if (!isDetached) {
this.registerUnmountedView(view);
Expand Down Expand Up @@ -1321,7 +1324,7 @@ export const Paper = View.extend({
if (!(cid in unmounted)) continue;
var view = views[cid];
if (!view) continue;
if (view.DETACHABLE && viewportFn && !viewportFn.call(this, view, false, this)) {
if (view.DETACHABLE && (this.isCellViewExplicitlyHidden(view.model) || (viewportFn && !viewportFn.call(this, view, false, this)))) {
// Push at the end of all unmounted ids, so this can be check later again
unmountedCids.push(cid);
continue;
Expand All @@ -1338,7 +1341,6 @@ export const Paper = View.extend({
checkMountedViews: function(viewportFn, opt) {
opt || (opt = {});
var unmountCount = 0;
if (typeof viewportFn !== 'function') return unmountCount;
var batchSize = 'unmountBatchSize' in opt ? opt.unmountBatchSize : Infinity;
var updates = this._updates;
var mountedCids = updates.mountedCids;
Expand All @@ -1348,7 +1350,7 @@ export const Paper = View.extend({
if (!(cid in mounted)) continue;
var view = views[cid];
if (!view) continue;
if (!view.DETACHABLE || viewportFn.call(this, view, true, this)) {
if (!view.DETACHABLE || (!this.isCellViewExplicitlyHidden(view.model) && (!viewportFn || viewportFn.call(this, view, true, this)))) {
// Push at the end of all mounted ids, so this can be check later again
mountedCids.push(cid);
continue;
Expand All @@ -1367,7 +1369,7 @@ export const Paper = View.extend({
if (typeof viewportFn !== 'function') viewportFn = null;
const updates = this._updates;
const { mounted, unmounted } = updates;
const visible = !cellView.DETACHABLE || !viewportFn || viewportFn.call(this, cellView, false, this);
const visible = (!cellView.DETACHABLE || (!this.isCellViewExplicitlyHidden(cellView.model) && (!viewportFn || viewportFn.call(this, cellView, false, this))));

let isUnmounted = false;
let isMounted = false;
Expand Down Expand Up @@ -1800,6 +1802,28 @@ export const Paper = View.extend({
});
},

requestCellViewVisibility(cell, toggle) {
// true = "show view", false = "hide view"
if (toggle) {
this._hiddenViews.delete(cell.id);
} else {
this._hiddenViews.add(cell.id);
}
},

isCellViewExplicitlyHidden: function(cell) {
if (!cell) return false;

if (cell.isElement()) return (this._hiddenViews.has(cell.id));

// else: cell is a link
// - hide the link if any end element is hidden
// - TODO: currently does not hide links which are connected to a link that gets hidden due to source element being hidden
const hasHiddenSourceCell = (this.isCellViewExplicitlyHidden(cell.getSourceElement()));
const hasHiddenTargetCell = (this.isCellViewExplicitlyHidden(cell.getTargetElement()));
return (hasHiddenSourceCell || hasHiddenTargetCell);
},

removeView: function(cell) {

const { id } = cell;
Expand Down Expand Up @@ -1871,6 +1895,7 @@ export const Paper = View.extend({
invoke(this._views, 'remove');

this._views = {};
this._hiddenViews.clear();
},

sortViews: function() {
Expand Down Expand Up @@ -3366,4 +3391,3 @@ export const Paper = View.extend({
}]
}
});

Loading
Loading