Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[PE mobile] Fix get chart object

Browse source
This commit is contained in:
JuliaSvinareva 2021-01-29 15:22:54 +03:00
parent 338776c1a0
commit 779dc01aa1
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/presentationeditor/mobile/src/store/focusObjects.js
View file

@ -47,7 +47,7 @@ export class storeFocusObjects {
resultArr.splice(resultArr.indexOf('hyperlink'), 1); resultArr.splice(resultArr.indexOf('hyperlink'), 1);
} }
// Exclude shapes if chart exist // Exclude shapes if chart exist
if (resultArr.indexOf('chart') > -1) { if (resultArr.indexOf('chart') > -1 && resultArr.indexOf('shape') > -1) {
resultArr.splice(resultArr.indexOf('shape'), 1); resultArr.splice(resultArr.indexOf('shape'), 1);
} }
return resultArr; return resultArr;
@ -149,27 +149,18 @@ export class storeFocusObjects {
@computed get chartObject() { @computed get chartObject() {
const charts = []; const charts = [];
const shapes = []
for (let object of this._focusObjects) { for (let object of this._focusObjects) {
if (object.get_ObjectValue() == Asc.c_oAscTypeSelectElement.Chart) { if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Chart) {
charts.push(object); charts.push(object);
} }
else if(object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Shape && object.get_ObjectValue() && object.get_ObjectValue().get_FromChart()) {
shapes.push(object)
}
} }
const getTopObject = array => { if (charts.length > 0) {
if (array.length > 0) { const object = charts[charts.length - 1]; // get top
var object = array[array.length - 1]; // get top return object.get_ObjectValue();
return object.get_ObjectValue(); } else {
} else { return undefined;
return undefined; }
}
};
getTopObject(charts);
getTopObject(shapes);
} }
} }