Skip to content

Commit

Permalink
Merge branch 'develop' into feature/WRR-992
Browse files Browse the repository at this point in the history
  • Loading branch information
juwonjeong committed Sep 30, 2024
2 parents 5b55bc0 + 17c47f3 commit 85ef4c2
Show file tree
Hide file tree
Showing 33 changed files with 37,775 additions and 43,110 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ The following is a curated list of changes in the Enact sandstone module, newest

### Fixed

- `sandstone/Panels.Header` to show title and subtitle properly in `sandstone/WizardPanels`
- `sandstone/Scroller`, `sandstone/Slider`, and `sandstone/VirtualList` to have default prop when `undefined` prop is passed
- `sandstone/Scroller` to show scroll indicator when `focusableScrollbar` prop is `true`
- `sandstone/Scroller` to read out properly when `sandstone/Panels` has `sandstone/Scroller` with `focusableScrollbar`
- `sandstone/Steps` prop `size` to accept number type
- `sandstone/VideoPlayer` to show only the mini feedback when pressing play/pause key

## [2.9.0] - 2024-07-17

Expand Down
6 changes: 3 additions & 3 deletions Panels/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ const HeaderBase = kind({
slotBeforeRef,
slotSize,
titleCell,
type,
...rest
}) => {
delete rest.arranger;
Expand All @@ -447,7 +448,6 @@ const HeaderBase = kind({
delete rest.subtitleId;
delete rest.title;
delete rest.titleId;
delete rest.type;

// Set up the back button
const backButton = (backButtonAvailable && !noBackButton ? (
Expand Down Expand Up @@ -483,7 +483,7 @@ const HeaderBase = kind({
// Hide slots for the first render to avoid unexpected positioning when 'centered' is given.
// After the first render, HeaderMeasurementDecorator measures widths of slots and set right 'slotSize'.
const hideSlots = {
opacity: centered && (!slotBeforeRef.current || !slotAfterRef.current) ? '0' : null
opacity: centered && slotSize === '0rem' ? '0' : null
};

// The side Cells are always present, even if empty, to support the measurement ref.
Expand All @@ -496,7 +496,7 @@ const HeaderBase = kind({
{backButton}{slotBefore}
</span>
</Cell>
{titleCell}
{(type === 'wizard' && (slotBefore?.props?.visible || slotAfter?.props?.visible) && slotSize === '0rem') ? null : titleCell}
<Cell className={css.slotAfter} shrink={!syncCellSize} size={syncCellSize} style={hideSlots}>
<span ref={slotAfterRef} className={css.slotSizer}>
{slotAfter}{closeButton}
Expand Down
1 change: 1 addition & 0 deletions VideoPlayer/VideoPlayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,7 @@ const VideoPlayerBase = class extends Component {
this.mediaControlsSpotlightId = props.spotlightId + '_mediaControls';
this.jumpButtonPressed = null;
this.playerRef = createRef();
this.playbackRate = 1;

// Re-render-necessary State
this.state = {
Expand Down
Loading

0 comments on commit 85ef4c2

Please sign in to comment.