Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update: expand _imageAlignment properties and set popup item DOM order (fixes #289) #290

Merged
merged 6 commits into from
Jan 3, 2024
Merged

Update: expand _imageAlignment properties and set popup item DOM order (fixes #289) #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3b190c9
Use _imageAlignment condition to deter popup item content order
kirsty-hames Dec 4, 2023
0a8f824
popup image alignment styles updated inline with core notify
kirsty-hames Dec 4, 2023
f0eb2b7
update schema _imageAlignment property
kirsty-hames Dec 4, 2023
a64e7f8
update schema _imageAlignment property
kirsty-hames Dec 4, 2023
3ab764f
update README _imageAlignment description
kirsty-hames Dec 4, 2023
6928060
use image partial for popup item image
kirsty-hames Dec 6, 2023
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ This is the main text for a hot spot pop-up.
This text is displayed when `device.screenSize` is `small` (i.e. when viewed on mobile devices, except when the [_isNarrativeOnMobile](#_isnarrativeonmobile-boolean) setting is set to `false`). It is presented in a title bar above the image.

#### \_imageAlignment (string):
Defines the horizontal alignment of the item image in the pop up. Left: Image aligned to the left of the text area. Right: Image aligned to the right of the text area. The default alignment is `right`.
Defines the alignment of the item image in the pop up. Left: Image aligned to the left of the text area. Top: Image aligned above the text area. Right: Image aligned to the right of the text area. Bottom: Image aligned below the text area. The default alignment is `right`.

#### \_classes (string):
CSS class name(s) to be applied to the popup item. Classes available by default are:
Expand Down
36 changes: 15 additions & 21 deletions less/hotgraphicPopup.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,11 @@

// Pop up item
// --------------------------------------------------
&__item-image-container {
width: 60%;
margin: auto;
}

@media (min-width: @device-width-medium) {
&__item {
display: flex;
align-items: flex-start;
}

&__item-content {
width: 60%;
}

&__item-image-container {
width: 40%;
margin-left: @item-padding;
flex-direction: column;
row-gap: 1rem;
}
}

Expand Down Expand Up @@ -81,16 +68,23 @@
.u-display-none;
}

// Align hotgraphic pop up image to the left
// Hotgraphic pop up image alignment
// --------------------------------------------------
@media (min-width: @device-width-medium) {
&__item.align-image-left {
flex-direction: row-reverse;
&__item.align-image-left,
&__item.align-image-right {
flex-direction: row;
column-gap: 1rem;
}

&__item.align-image-left &__item-content,
&__item.align-image-right &__item-content {
width: 60%;
}

&__item.align-image-left &__item-image-container {
margin-left: inherit;
margin-right: @item-padding;
&__item.align-image-left &__item-image-container,
&__item.align-image-right &__item-image-container {
width: 40%;
}
}

Expand Down
4 changes: 2 additions & 2 deletions properties.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,9 @@
"type": "string",
"required": false,
"default": "right",
"inputType": {"type":"Select", "options":["left","right"]},
"inputType": {"type":"Select", "options":["left","top","right","bottom"]},
"title": "Image alignment",
"help": "Defines the horizontal alignment of the item image in the pop up. Left: Image aligned to the left of the text area. Right: Image aligned to the right of the text area. The default alignment is `right`."
"help": "Defines the alignment of the item image in the pop up. Left: Image aligned to the left of the text area. Top: Image aligned above the text area. Right: Image aligned to the right of the text area. Bottom: Image aligned below the text area.The default alignment is `right`."
},
"_graphic": {
"type": "object",
Expand Down
6 changes: 4 additions & 2 deletions schema/component.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,13 @@
"_imageAlignment": {
"type": "string",
"title": "Image alignment",
"description": "Defines the horizontal alignment of the item image in the pop up. Left: Image aligned to the left of the text area. Right: Image aligned to the right of the text area. The default alignment is `right`",
"description": "Defines the alignment of the item image in the pop up. Left: Image aligned to the left of the text area. Top: Image aligned above the text area. Right: Image aligned to the right of the text area. Bottom: Image aligned below the text area.The default alignment is `right`.",
"default": "right",
"enum": [
"left",
"right"
"top",
"right",
"bottom"
],
"_backboneForms": "Select"
},
Expand Down
38 changes: 15 additions & 23 deletions templates/hotgraphicPopup.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ export default function HotgraphicPopup(props) {
aria-hidden={!_isActive ? true : null}
>

{(_imageAlignment === 'left' || _imageAlignment === 'top') &&
<templates.image {..._graphic}
classNamePrefixSeparator='__item-'
classNamePrefixes={['component-item', 'hotgraphic-popup']}
attributionClassNamePrefixes={['component', 'hotgraphic-popup']}
/>
}

<div className="hotgraphic-popup__item-content">
<div className="hotgraphic-popup__item-content-inner">

Expand Down Expand Up @@ -68,29 +76,13 @@ export default function HotgraphicPopup(props) {
</div>
</div>

<div className={classes([
'hotgraphic-popup__item-image-container',
_graphic.attribution && 'has-attribution'
])}
>

<img
className="hotgraphic-popup__item-image"
src={_graphic.src}
aria-label={_graphic.alt || null}
aria-hidden={!_graphic.alt || null}
/>

{_graphic.attribution &&
<div className="component__attribution hotgraphic-popup__attribution">
<div
className="component__attribution-inner hotgraphic-popup__attribution-inner"
dangerouslySetInnerHTML={{ __html: _graphic.attribution }}
/>
</div>
}

</div>
{(_imageAlignment === 'right' || _imageAlignment === 'bottom') &&
<templates.image {..._graphic}
classNamePrefixSeparator='__item-'
classNamePrefixes={['component-item', 'hotgraphic-popup']}
attributionClassNamePrefixes={['component', 'hotgraphic-popup']}
/>
}

</div>
)}
Expand Down