Merge branch 'dev' into dev.loading
This commit is contained in:
commit
0ac42b3500
41 changed files with 1609 additions and 1241 deletions
|
@ -17,6 +17,8 @@ export const FAST_BOOT = 0;
|
|||
/** Disable any call to the API (default = false) */
|
||||
export const DISABLE_API = false;
|
||||
|
||||
export const DEFAULT_LANGUAGE = 'fr';
|
||||
|
||||
/**
|
||||
* Replace the SVG viewer by a canvas
|
||||
* Better compatibility with Gecko and WebKit engines like Firefox and Safari.
|
||||
|
@ -234,8 +236,6 @@ export function GetDefaultContainerProps(type: string,
|
|||
height: number,
|
||||
containerConfig: IAvailableContainer): IContainerProperties {
|
||||
const orientation = containerConfig.Orientation ?? Orientation.Horizontal;
|
||||
const defaultIsFlex = (orientation === Orientation.Vertical && containerConfig.Height === undefined) ||
|
||||
(orientation === Orientation.Horizontal && containerConfig.Width === undefined);
|
||||
return ({
|
||||
id: `${type}-${typeCount}`,
|
||||
type,
|
||||
|
@ -249,7 +249,7 @@ export function GetDefaultContainerProps(type: string,
|
|||
width,
|
||||
height,
|
||||
isAnchor: containerConfig.IsAnchor ?? false,
|
||||
isFlex: containerConfig.IsFlex ?? defaultIsFlex,
|
||||
isFlex: containerConfig.IsFlex ?? false,
|
||||
positionReference: containerConfig.PositionReference ?? PositionReference.TopLeft,
|
||||
minWidth: containerConfig.MinWidth ?? 1,
|
||||
maxWidth: containerConfig.MaxWidth ?? Number.MAX_SAFE_INTEGER,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue