@stackflow/plugin-basic-ui 1.13.1 → 1.14.0-private.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -100,17 +100,25 @@ const AppScreen: React.FC<AppScreenProps> = ({
100
100
  zIndexBase + (modalPresentationStyle === "fullScreen" ? 2 : 0);
101
101
  zIndexPaper =
102
102
  zIndexBase +
103
- (hasAppBar && modalPresentationStyle !== "fullScreen" ? 1 : 3);
103
+ (hasAppBar && modalPresentationStyle !== "fullScreen"
104
+ ? appBar.enterStyle === "cover"
105
+ ? 2
106
+ : 1
107
+ : 3);
104
108
  zIndexEdge = zIndexBase + 4;
105
109
  zIndexAppBar = zIndexBase + 7;
106
110
  break;
107
111
  }
108
112
  default: {
109
113
  zIndexDim = zIndexBase;
110
- zIndexPaper = zIndexBase + (activityEnterStyle === "slideInLeft" ? 1 : 3);
114
+ zIndexPaper =
115
+ zIndexBase +
116
+ (activityEnterStyle === "slideInLeft" && appBar?.enterStyle !== "cover"
117
+ ? 0
118
+ : 2);
111
119
  zIndexEdge = zIndexBase + 4;
112
120
  zIndexAppBar =
113
- zIndexBase + (activityEnterStyle === "slideInLeft" ? 7 : 4);
121
+ zIndexBase + (activityEnterStyle === "slideInLeft" ? 6 : 4);
114
122
  break;
115
123
  }
116
124
  }
@@ -123,8 +131,9 @@ const AppScreen: React.FC<AppScreenProps> = ({
123
131
  });
124
132
  useStyleEffectOffset({
125
133
  refs:
126
- globalOptions.theme === "cupertino" ||
127
- activityEnterStyle === "slideInLeft"
134
+ (globalOptions.theme === "cupertino" ||
135
+ activityEnterStyle === "slideInLeft") &&
136
+ appBar?.enterStyle !== "cover"
128
137
  ? [paperRef]
129
138
  : [paperRef, appBarRef],
130
139
  offsetStyles:
@@ -152,6 +161,7 @@ const AppScreen: React.FC<AppScreenProps> = ({
152
161
  appBarRef,
153
162
  offset: OFFSET_PX_CUPERTINO,
154
163
  transitionDuration: globalVars.transitionDuration,
164
+ moveAppBarTogether: appBar?.enterStyle === "cover",
155
165
  preventSwipeBack:
156
166
  isSwipeBackPrevented || globalOptions.theme !== "cupertino",
157
167
  getActivityTransitionState() {
@@ -277,7 +287,7 @@ const AppScreen: React.FC<AppScreenProps> = ({
277
287
  data-part="paper"
278
288
  {...activityDataAttributes}
279
289
  >
280
- {children}
290
+ <div className={css.paperContent({ hasAppBar })}>{children}</div>
281
291
  </div>
282
292
  {!activity?.isRoot &&
283
293
  globalOptions.theme === "cupertino" &&
package/src/index.ts CHANGED
@@ -7,6 +7,7 @@ export {
7
7
  AppScreenProps,
8
8
  useAppScreen,
9
9
  } from "./components/AppScreen";
10
+ export { default as AppBar } from "./components/AppBar";
10
11
  export { vars as appScreenVars } from "./components/AppScreen.css";
11
12
  export {
12
13
  default as BottomSheet,