diff --git a/ui/enums/enums.d.ts b/ui/enums/enums.d.ts index 1d73cd395..0c8fd3387 100644 --- a/ui/enums/enums.d.ts +++ b/ui/enums/enums.d.ts @@ -191,9 +191,14 @@ export var visible: string; /** - * The view is not visible and won't take place in the layout. + * Obsolete. Please use 'collapse' instead! */ export var collapsed: string; + + /** + * The view is not visible and won't take place in the layout. + */ + export var collapse: string; } /** diff --git a/ui/enums/enums.ts b/ui/enums/enums.ts index d88744313..7c0d3d539 100644 --- a/ui/enums/enums.ts +++ b/ui/enums/enums.ts @@ -48,6 +48,7 @@ export module Stretch { export module Visibility { export var visible: string = "visible"; + export var collapse: string = "collapse"; export var collapsed: string = "collapsed"; } diff --git a/ui/styling/converters.ts b/ui/styling/converters.ts index 0dcf03d0e..e81928872 100644 --- a/ui/styling/converters.ts +++ b/ui/styling/converters.ts @@ -29,6 +29,8 @@ export var numberConverter = parseFloat; export function visibilityConverter(value: string): string { if (value.toLowerCase() === enums.Visibility.collapsed) { return enums.Visibility.collapsed; + } else if (value.toLowerCase() === enums.Visibility.collapse) { + return enums.Visibility.collapse; } return enums.Visibility.visible; } diff --git a/ui/styling/style.ts b/ui/styling/style.ts index 500cab31c..3982e403a 100644 --- a/ui/styling/style.ts +++ b/ui/styling/style.ts @@ -504,11 +504,11 @@ export var paddingBottomProperty = new styleProperty.Property("paddingBottom", " new observable.PropertyMetadata(0, observable.PropertyMetadataSettings.AffectsLayout, null, isPaddingValid), converters.numberConverter); function isVisibilityValid(value: string): boolean { - return value === enums.Visibility.visible || value === enums.Visibility.collapsed; + return value === enums.Visibility.visible || value === enums.Visibility.collapse || value === enums.Visibility.collapsed; } function setLayoutInfoVisibility(data: observable.PropertyChangeData) { - (data.object)._view._isVisibleCache = data.newValue !== enums.Visibility.collapsed; + (data.object)._view._isVisibleCache = (data.newValue !== enums.Visibility.collapse || data.newValue !== enums.Visibility.collapsed); } export var visibilityProperty = new styleProperty.Property("visibility", "visibility", diff --git a/ui/styling/stylers.android.ts b/ui/styling/stylers.android.ts index 2084ad276..42d510694 100644 --- a/ui/styling/stylers.android.ts +++ b/ui/styling/stylers.android.ts @@ -227,7 +227,7 @@ export class ActivityIndicatorStyler implements definition.stylers.Styler { } public static setIndicatorVisibility(isBusy: boolean, visibility: string, nativeView: android.view.View) { - if (visibility === enums.Visibility.collapsed) { + if (visibility === enums.Visibility.collapsed || visibility === enums.Visibility.collapse) { nativeView.setVisibility(android.view.View.GONE); } else {