Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/core/ui/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export type { SelectedIndexChangedEventData } from './segmented-bar';
export { Slider } from './slider';
export type { AccessibilityDecrementEventData, AccessibilityIncrementEventData } from './slider';
export { SplitView } from './split-view';
export type { SplitStyle, SplitRole, SplitDisplayMode, SplitBehavior } from './split-view';

export { addTaggedAdditionalCSS, removeTaggedAdditionalCSS, resolveFileNameFromUrl } from './styling/style-scope';
export { Background } from './styling/background';
Expand Down
2 changes: 0 additions & 2 deletions packages/core/ui/split-view/index.android.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { SplitViewBase } from './split-view-common';

export { SplitBehavior, SplitRole, SplitStyle, SplitDisplayMode } from './split-view-common';

export class SplitView extends SplitViewBase {
// Android does not have a native SplitViewController equivalent.
}
7 changes: 6 additions & 1 deletion packages/core/ui/split-view/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { SplitViewBase } from './split-view-common';

export type { SplitBehavior, SplitRole, SplitStyle, SplitDisplayMode } from './split-view-common';
// Note: Using 'inspector' splitRole does not (yet) require a distinct style; it's an optional trailing column.
export type SplitStyle = 'automatic' | 'double' | 'triple';

export type SplitRole = 'primary' | 'secondary' | 'supplementary' | 'inspector';
export type SplitDisplayMode = 'automatic' | 'secondaryOnly' | 'oneBesideSecondary' | 'oneOverSecondary' | 'twoBesideSecondary' | 'twoOverSecondary' | 'twoDisplaceSecondary';
export type SplitBehavior = 'automatic' | 'tile' | 'overlay' | 'displace';

/**
* iOS UISplitViewController-backed container.
Expand Down
3 changes: 2 additions & 1 deletion packages/core/ui/split-view/index.ios.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { SplitViewBase, SplitRole, displayModeProperty, splitBehaviorProperty, preferredPrimaryColumnWidthFractionProperty, preferredSupplementaryColumnWidthFractionProperty, preferredInspectorColumnWidthFractionProperty } from './split-view-common';
import { SplitViewBase, displayModeProperty, splitBehaviorProperty, preferredPrimaryColumnWidthFractionProperty, preferredSupplementaryColumnWidthFractionProperty, preferredInspectorColumnWidthFractionProperty } from './split-view-common';
import { View } from '../core/view';
import { layout } from '../../utils';
import { SDK_VERSION } from '../../utils/constants';
import type { SplitRole } from '.';

@NativeClass
class UISplitViewControllerDelegateImpl extends NSObject implements UISplitViewControllerDelegate {
Expand Down
9 changes: 1 addition & 8 deletions packages/core/ui/split-view/split-view-common.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
import { LayoutBase } from '../layouts/layout-base';
import { View, CSSType } from '../core/view';
import { Property, makeParser, makeValidator } from '../core/properties';
import type { SplitBehavior, SplitDisplayMode, SplitRole, SplitStyle } from '.';

export type SplitRole = 'primary' | 'secondary' | 'supplementary' | 'inspector';
const splitRoleConverter = makeParser<SplitRole>(makeValidator<SplitRole>('primary', 'secondary', 'supplementary', 'inspector'));

// Note: Using 'inspector' splitRole does not (yet) require a distinct style; it's an optional trailing column.
export type SplitStyle = 'automatic' | 'double' | 'triple';

export type SplitDisplayMode = 'automatic' | 'secondaryOnly' | 'oneBesideSecondary' | 'oneOverSecondary' | 'twoBesideSecondary' | 'twoOverSecondary' | 'twoDisplaceSecondary';
const splitDisplayModeConverter = makeParser<SplitDisplayMode>(makeValidator<SplitDisplayMode>('automatic', 'secondaryOnly', 'oneBesideSecondary', 'oneOverSecondary', 'twoBesideSecondary', 'twoOverSecondary', 'twoDisplaceSecondary'));

export type SplitBehavior = 'automatic' | 'tile' | 'overlay' | 'displace';
const splitBehaviorConverter = makeParser<SplitBehavior>(makeValidator<SplitBehavior>('automatic', 'tile', 'overlay', 'displace'));

// Default child roles (helps authoring without setting splitRole on children)
Expand Down