Browse Source

Fix Layers view not changing on page switch. Closes #5593

pull/5622/head
Artur Arseniev 3 years ago
parent
commit
9a4945290b
  1. 5
      src/navigator/view/ItemView.ts
  2. 2
      src/utils/mixins.ts

5
src/navigator/view/ItemView.ts

@ -375,9 +375,8 @@ export default class ItemView extends View {
return this.caret;
}
setRoot(el: Component | string) {
el = isString(el) ? this.em.getWrapper()?.find(el)[0]! : el;
const model = getModel(el);
setRoot(cmp: Component | string) {
const model = isString(cmp) ? this.em.getWrapper()?.find(cmp)[0]! : cmp;
if (!model) return;
this.stopListening();
this.model = model;

2
src/utils/mixins.ts

@ -187,7 +187,7 @@ export const deepMerge = (...args: ObjectAny[]) => {
* @param {HTMLElement|Component} el Component or HTML element
* @return {Component}
*/
const getModel = (el: any, $?: any): Component | undefined => {
const getModel = (el: HTMLElement & { __cashData?: any }, $?: any): Component | undefined => {
let model;
if (!$ && el && el.__cashData) {
model = el.__cashData.model;

Loading…
Cancel
Save