Skip to content

Commit 13a5eaa

Browse files
authored
fix(SplitView): export improvements (#10968)
1 parent b4a1b46 commit 13a5eaa

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

packages/core/ui/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export type { SelectedIndexChangedEventData } from './segmented-bar';
7272
export { Slider } from './slider';
7373
export type { AccessibilityDecrementEventData, AccessibilityIncrementEventData } from './slider';
7474
export { SplitView } from './split-view';
75+
export type { SplitStyle, SplitRole, SplitDisplayMode, SplitBehavior } from './split-view';
7576

7677
export { addTaggedAdditionalCSS, removeTaggedAdditionalCSS, resolveFileNameFromUrl } from './styling/style-scope';
7778
export { Background } from './styling/background';
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { SplitViewBase } from './split-view-common';
22

3-
export { SplitBehavior, SplitRole, SplitStyle, SplitDisplayMode } from './split-view-common';
4-
53
export class SplitView extends SplitViewBase {
64
// Android does not have a native SplitViewController equivalent.
75
}

packages/core/ui/split-view/index.d.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import { SplitViewBase } from './split-view-common';
22

3-
export type { SplitBehavior, SplitRole, SplitStyle, SplitDisplayMode } from './split-view-common';
3+
// Note: Using 'inspector' splitRole does not (yet) require a distinct style; it's an optional trailing column.
4+
export type SplitStyle = 'automatic' | 'double' | 'triple';
5+
6+
export type SplitRole = 'primary' | 'secondary' | 'supplementary' | 'inspector';
7+
export type SplitDisplayMode = 'automatic' | 'secondaryOnly' | 'oneBesideSecondary' | 'oneOverSecondary' | 'twoBesideSecondary' | 'twoOverSecondary' | 'twoDisplaceSecondary';
8+
export type SplitBehavior = 'automatic' | 'tile' | 'overlay' | 'displace';
49

510
/**
611
* iOS UISplitViewController-backed container.

packages/core/ui/split-view/index.ios.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { SplitViewBase, SplitRole, displayModeProperty, splitBehaviorProperty, preferredPrimaryColumnWidthFractionProperty, preferredSupplementaryColumnWidthFractionProperty, preferredInspectorColumnWidthFractionProperty } from './split-view-common';
1+
import { SplitViewBase, displayModeProperty, splitBehaviorProperty, preferredPrimaryColumnWidthFractionProperty, preferredSupplementaryColumnWidthFractionProperty, preferredInspectorColumnWidthFractionProperty } from './split-view-common';
22
import { View } from '../core/view';
33
import { layout } from '../../utils';
44
import { SDK_VERSION } from '../../utils/constants';
5+
import type { SplitRole } from '.';
56

67
@NativeClass
78
class UISplitViewControllerDelegateImpl extends NSObject implements UISplitViewControllerDelegate {

packages/core/ui/split-view/split-view-common.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
import { LayoutBase } from '../layouts/layout-base';
22
import { View, CSSType } from '../core/view';
33
import { Property, makeParser, makeValidator } from '../core/properties';
4+
import type { SplitBehavior, SplitDisplayMode, SplitRole, SplitStyle } from '.';
45

5-
export type SplitRole = 'primary' | 'secondary' | 'supplementary' | 'inspector';
66
const splitRoleConverter = makeParser<SplitRole>(makeValidator<SplitRole>('primary', 'secondary', 'supplementary', 'inspector'));
7-
8-
// Note: Using 'inspector' splitRole does not (yet) require a distinct style; it's an optional trailing column.
9-
export type SplitStyle = 'automatic' | 'double' | 'triple';
10-
11-
export type SplitDisplayMode = 'automatic' | 'secondaryOnly' | 'oneBesideSecondary' | 'oneOverSecondary' | 'twoBesideSecondary' | 'twoOverSecondary' | 'twoDisplaceSecondary';
127
const splitDisplayModeConverter = makeParser<SplitDisplayMode>(makeValidator<SplitDisplayMode>('automatic', 'secondaryOnly', 'oneBesideSecondary', 'oneOverSecondary', 'twoBesideSecondary', 'twoOverSecondary', 'twoDisplaceSecondary'));
13-
14-
export type SplitBehavior = 'automatic' | 'tile' | 'overlay' | 'displace';
158
const splitBehaviorConverter = makeParser<SplitBehavior>(makeValidator<SplitBehavior>('automatic', 'tile', 'overlay', 'displace'));
169

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

0 commit comments

Comments
 (0)