[mobile] Fix add custom color

This commit is contained in:
JuliaSvinareva 2021-03-30 16:19:20 +03:00
parent 0824d2388d
commit d1c32d886f
14 changed files with 30 additions and 30 deletions

View file

@ -45,7 +45,7 @@ const PaletteFill = inject("storeFocusObjects", "storeChartSettings", "storePale
}
} else {
// open custom color menu
props.f7router.navigate('/edit-chart-custom-fill-color/');
props.f7router.navigate('/edit-chart-custom-fill-color/', {props: {onFillColor: props.onFillColor}});
}
};
return(
@ -98,7 +98,7 @@ const PageBorderColor = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-chart-custom-border-color/');
props.f7router.navigate('/edit-chart-custom-border-color/', {props: {onBorderColor: props.onBorderColor}});
}
};
return(
@ -194,7 +194,7 @@ const PageStyle = props => {
</div>
</Tab>
<Tab key={"de-tab-chart-fill"} id={"edit-chart-fill"} className="page-content no-padding-top">
<PaletteFill onFillColor={props.onFillColor}/>
<PaletteFill onFillColor={props.onFillColor} f7router={props.f7router}/>
</Tab>
<Tab key={"de-tab-chart-border"} id={"edit-chart-border"} className="page-content no-padding-top">
<List>

View file

@ -138,7 +138,7 @@ const PageBackgroundColor = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-paragraph-custom-color/');
props.f7router.navigate('/edit-paragraph-custom-color/', {props: {onBackgroundColor: props.onBackgroundColor}});
}
};
return(

View file

@ -45,7 +45,7 @@ const PaletteFill = inject("storeFocusObjects", "storeShapeSettings", "storePale
}
} else {
// open custom color menu
props.f7router.navigate('/edit-shape-custom-fill-color/');
props.f7router.navigate('/edit-shape-custom-fill-color/', {props: {onFillColor: props.onFillColor}});
}
};
return(
@ -98,7 +98,7 @@ const PageBorderColor = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-shape-custom-border-color/');
props.f7router.navigate('/edit-shape-custom-border-color/', {props: {onBorderColor: props.onBorderColor}});
}
};
return(
@ -150,7 +150,7 @@ const PageStyle = props => {
</Navbar>
<Tabs animated>
<Tab key={"de-tab-shape-fill"} id={"edit-shape-fill"} className="page-content no-padding-top" tabActive={true}>
<PaletteFill onFillColor={props.onFillColor}/>
<PaletteFill onFillColor={props.onFillColor} f7router={props.f7router} />
</Tab>
<Tab key={"de-tab-shape-border"} id={"edit-shape-border"} className="page-content no-padding-top">
<List>

View file

@ -250,7 +250,7 @@ const TabFillColor = inject("storeFocusObjects", "storeTableSettings", "storePal
}
} else {
// open custom color menu
props.f7router.navigate('/edit-table-custom-fill-color/');
props.f7router.navigate('/edit-table-custom-fill-color/', {props: {onFillColor: props.onFillColor}});
}
};
return(

View file

@ -258,7 +258,7 @@ const PageFontColor = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-text-custom-font-color/');
props.f7router.navigate('/edit-text-custom-font-color/', {props: {onTextColor: props.onTextColor}});
}
};
return(
@ -317,7 +317,7 @@ const PageBackgroundColor = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-text-custom-back-color/');
props.f7router.navigate('/edit-text-custom-back-color/', {props: {onBackgroundColor: props.onBackgroundColor}});
}
};
return(

View file

@ -49,7 +49,7 @@ const PaletteFill = inject("storeFocusObjects", "storeChartSettings", "storePale
}
} else {
// open custom color menu
props.f7router.navigate('/edit-chart-custom-fill-color/');
props.f7router.navigate('/edit-chart-custom-fill-color/', {props: {onFillColor: props.onFillColor}});
}
};
@ -107,7 +107,7 @@ const PageBorderColor = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-chart-custom-border-color/');
props.f7router.navigate('/edit-chart-custom-border-color/', {props: {onBorderColor: props.onBorderColor}});
}
};
@ -206,7 +206,7 @@ const PageStyle = props => {
</div>
</Tab>
<Tab key={"pe-tab-chart-fill"} id={"edit-chart-fill"} className="page-content no-padding-top">
<PaletteFill onFillColor={props.onFillColor}/>
<PaletteFill onFillColor={props.onFillColor} f7router={props.f7router}/>
</Tab>
<Tab key={"pe-tab-chart-border"} id={"edit-chart-border"} className="page-content no-padding-top">
<List>

View file

@ -63,7 +63,7 @@ const PaletteFill = inject("storeFocusObjects", "storeShapeSettings", "storePale
}
} else {
// open custom color menu
props.f7router.navigate('/edit-shape-custom-fill-color/');
props.f7router.navigate('/edit-shape-custom-fill-color/', {props: {onFillColor: props.onFillColor}});
}
};
@ -118,7 +118,7 @@ const PageStyle = props => {
</Navbar>
<Tabs animated>
<Tab key={"pe-tab-shape-fill"} id={"edit-shape-fill"} className="page-content no-padding-top" tabActive={true}>
<PaletteFill onFillColor={props.onFillColor}/>
<PaletteFill onFillColor={props.onFillColor} f7router={props.f7router}/>
</Tab>
<Tab key={"pe-tab-shape-border"} id={"edit-shape-border"} className="page-content no-padding-top">
<List>
@ -351,7 +351,7 @@ const PageBorderColor = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-shape-custom-border-color/');
props.f7router.navigate('/edit-shape-custom-border-color/', {props: {onBorderColor: props.onBorderColor}});
}
};
return (

View file

@ -397,7 +397,7 @@ const PageFillColor = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-custom-color/');
props.f7router.navigate('/edit-custom-color/', {props: {onFillColor: props.onFillColor}});
}
};

View file

@ -125,7 +125,7 @@ const TabFillColor = inject("storeFocusObjects", "storeTableSettings", "storePal
}
} else {
// open custom color menu
props.f7router.navigate('/edit-table-custom-fill-color/');
props.f7router.navigate('/edit-table-custom-fill-color/', {props: {onFillColor: props.onFillColor}});
}
};
@ -309,7 +309,7 @@ const PageStyle = props => {
</List>
</Tab>
<Tab key={"pe-tab-table-fill"} id={"edit-table-fill"} className="page-content no-padding-top">
<TabFillColor onFillColor={props.onFillColor}/>
<TabFillColor onFillColor={props.onFillColor} f7router={props.f7router}/>
</Tab>
<Tab key={"pe-tab-table-border"} id={"edit-table-border"} className="page-content no-padding-top">
<TabBorder onBorderTypeClick={props.onBorderTypeClick}/>

View file

@ -249,7 +249,7 @@ const PageFontColor = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-text-custom-font-color/');
props.f7router.navigate('/edit-text-custom-font-color/', {props: {onTextColor: props.onTextColor}});
}
};

View file

@ -204,7 +204,7 @@ const PageTextColorCell = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-cell-text-custom-color/');
props.f7router.navigate('/edit-cell-text-custom-color/', {props: {onTextColor: props.onTextColor}});
}
};
@ -245,7 +245,7 @@ const PageFillColorCell = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-cell-fill-custom-color/');
props.f7router.navigate('/edit-cell-fill-custom-color/', {props: {onFillColor: props.onFillColor}});
}
};
@ -572,7 +572,7 @@ const PageBorderColorCell = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-border-custom-color-cell/');
props.f7router.navigate('/edit-border-custom-color-cell/', {props: {onBorderStyle: props.onBorderStyle}});
}
};

View file

@ -49,7 +49,7 @@ const PaletteFill = inject("storeFocusObjects", "storeChartSettings", "storePale
}
} else {
// open custom color menu
props.f7router.navigate('/edit-chart-custom-fill-color/');
props.f7router.navigate('/edit-chart-custom-fill-color/', {props: {onFillColor: props.onFillColor}});
}
};
@ -109,7 +109,7 @@ const PageBorderColor = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-chart-custom-border-color/');
props.f7router.navigate('/edit-chart-custom-border-color/', {props: {onBorderColor: props.onBorderColor}});
}
};
@ -208,7 +208,7 @@ const PageStyle = props => {
</div>
</Tab>
<Tab key={"sse-tab-chart-fill"} id={"edit-chart-fill"} className="page-content no-padding-top">
<PaletteFill onFillColor={props.onFillColor}/>
<PaletteFill onFillColor={props.onFillColor} f7router={props.f7router}/>
</Tab>
<Tab key={"sse-tab-chart-border"} id={"edit-chart-border"} className="page-content no-padding-top">
<List>

View file

@ -64,7 +64,7 @@ const PaletteFill = inject("storeFocusObjects", "storeShapeSettings", "storePale
}
} else {
// open custom color menu
props.f7router.navigate('/edit-shape-custom-fill-color/');
props.f7router.navigate('/edit-shape-custom-fill-color/', {props: {onFillColor: props.onFillColor}});
}
};
@ -119,7 +119,7 @@ const PageStyle = props => {
</Navbar>
<Tabs animated>
<Tab key={"se-tab-shape-fill"} id={"edit-shape-fill"} className="page-content no-padding-top" tabActive={true}>
<PaletteFill onFillColor={props.onFillColor}/>
<PaletteFill onFillColor={props.onFillColor} f7router={props.f7router}/>
</Tab>
<Tab key={"se-tab-shape-border"} id={"edit-shape-border"} className="page-content no-padding-top">
<List>
@ -313,7 +313,7 @@ const PageBorderColor = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-shape-custom-border-color/');
props.f7router.navigate('/edit-shape-custom-border-color/', {props: {onBorderColor: props.onBorderColor}});
}
};
return (

View file

@ -178,7 +178,7 @@ const PageFontColor = props => {
}
} else {
// open custom color menu
props.f7router.navigate('/edit-text-custom-font-color/');
props.f7router.navigate('/edit-text-custom-font-color/', {props: {onTextColor: props.onTextColor}});
}
};