search

iTwin / appui

Monorepo for iTwin.js AppUi
MIT License
9 stars 2 forks source link

Move /content apis from appui-abstract into appui-react (backport #1033) #1039

Closed mergify[bot] closed 2 months ago

mergify[bot] commented 2 months ago

incoming from @itwin/appui-abstract:

ContentLayoutProps LayoutFragmentProps LayoutHorizontalSplitProps LayoutSplitPropsBase LayoutVerticalSplitProps StandardContentLayouts

This is an automatic backport of pull request #1033 done by Mergify.

mergify[bot] commented 2 months ago

Cherry-pick of 79f71b01fa761e96f3e17ab37eea8d6dc0fbbfb5 has failed:

On branch mergify/bp/release/4.9.x/pr-1033
Your branch is up to date with 'origin/release/4.9.x'.

You are currently cherry-picking commit 79f71b01f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
    new file:   common/changes/@itwin/appui-react/move-content-layout-from-abstract_2024-09-16-19-48.json
    modified:   docs/storybook/src/Utils.tsx
    modified:   docs/storybook/src/frontstage/ToolSettings.stories.tsx
    modified:   docs/storybook/src/hooks/useIsBackstageOpen.stories.tsx
    new file:   ui/appui-react/src/appui-react/content/ContentLayoutProps.ts
    modified:   ui/appui-react/src/appui-react/content/InternalContentLayoutManager.ts
    modified:   ui/appui-react/src/appui-react/content/StageContentLayout.ts
    new file:   ui/appui-react/src/appui-react/content/StandardContentLayouts.ts
    modified:   ui/appui-react/src/test/TestUtils.ts
    modified:   ui/appui-react/src/test/content/ViewportContentControl.test.tsx
    modified:   ui/appui-react/src/test/frontstage/FrontstageTestUtils.tsx
    modified:   ui/appui-react/src/test/utils/UiShowHideManager.test.tsx

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
    deleted by us:   apps/test-app/src/frontend/appui/frontstages/EditorFrontstage.tsx
    deleted by us:   apps/test-app/src/frontend/appui/frontstages/ElementStacking.tsx
    deleted by us:   apps/test-app/src/frontend/appui/frontstages/MainFrontstage.tsx
    deleted by us:   apps/test-app/src/frontend/appui/frontstages/WidgetApiFrontstage.tsx
    deleted by us:   apps/test-app/src/frontend/appui/frontstages/createTestFrontstage.tsx
    deleted by us:   apps/test-providers/src/tools/ContentLayoutTools.tsx
    deleted by us:   apps/test-providers/src/ui/frontstages/ContentLayoutFrontstage.tsx
    deleted by us:   apps/test-providers/src/ui/frontstages/CustomContentFrontstage.tsx
    deleted by us:   apps/test-providers/src/ui/frontstages/CustomFrontstageProvider.tsx
    deleted by us:   apps/test-providers/src/ui/frontstages/PopoutWindowsFrontstage.tsx
    deleted by us:   apps/test-providers/src/ui/frontstages/SynchronizedViewportFrontstage.tsx
    both modified:   common/api/appui-react.api.md
    both modified:   common/api/summary/appui-react.exports.csv
    both modified:   docs/changehistory/NextVersion.md
    deleted by us:   docs/storybook/src/components/ViewSelector.stories.tsx
    both modified:   test-apps/appui-test-app/appui-test-providers/src/ui/frontstages/registerStandardFrontstage.tsx
    both modified:   ui/appui-react/src/appui-react.ts
    both modified:   ui/appui-react/src/appui-react/content/ContentGroup.tsx
    both modified:   ui/appui-react/src/appui-react/content/ContentLayout.tsx
    both modified:   ui/appui-react/src/appui-react/framework/FrameworkContent.ts
    both modified:   ui/appui-react/src/test/configurableui/InternalConfigurableUiManager.test.tsx
    both modified:   ui/appui-react/src/test/content/ContentControl.test.tsx
    both modified:   ui/appui-react/src/test/content/ContentGroup.test.tsx
    both modified:   ui/appui-react/src/test/content/ContentLayout.test.tsx
    both modified:   ui/appui-react/src/test/content/ContentLayoutManager.test.ts
    both modified:   ui/appui-react/src/test/content/IModelViewportControl.test.tsx
    both modified:   ui/appui-react/src/test/content/SavedViewLayout.test.tsx
    both modified:   ui/appui-react/src/test/frontstage/NestedFrontstage.test.tsx
    both modified:   ui/appui-react/src/test/frontstage/StandardFrontstage.test.tsx

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally