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

Add tray styling #261

Merged
merged 7 commits into from
Jul 30, 2024
Merged

Add tray styling #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca02598
refactor(design): apply sidebar styles only to sidebar
steveoh Jul 30, 2024
869e2af
feat(design): add tray styling
steveoh Jul 30, 2024
61f8387
chore(monorepo): fix UMD typescript errors and tighten up config
stdavis Jul 30, 2024
9944853
fix(design): better horizontal flow for smaller mobile screens
stdavis Jul 30, 2024
0cb9d88
feat(design): implement tray variant for Drawer
stdavis Jul 30, 2024
4b37626
Revert "fix(layer-selector): remove deprecated default propTypes"
stdavis Jul 30, 2024
a46048b
fix(layer-selector): fix snapshot test
stdavis Jul 30, 2024
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
15 changes: 8 additions & 7 deletions packages/layer-selector/src/LayerSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,7 @@ const createLayerFactories = (

const ConditionalWrapper = ({ condition, wrapper, children }) =>
condition ? wrapper(children) : children;
const LayerSelector = (
props = {
makeExpandable: true,
position: 'top-right',
showOpacitySlider: false,
},
) => {
const LayerSelector = (props) => {
const [layers, setLayers] = useState({
baseLayers: [],
overlays: [],
Expand Down Expand Up @@ -427,6 +421,7 @@ const LayerSelector = (
]);

const onItemChanged = (event, props) => {
console.log('LayerSelector.onItemChanged', props);
const overlays = layers.overlays;
const baseLayers = layers.baseLayers;

Expand Down Expand Up @@ -584,6 +579,12 @@ LayerSelector.propTypes = {
showOpacitySlider: PropTypes.bool,
};

LayerSelector.defaultProps = {
makeExpandable: true,
position: 'top-right',
showOpacitySlider: false,
};

LayerSelectorItem.propTypes = {
onChange: PropTypes.func.isRequired,
selected: PropTypes.bool.isRequired,
Expand Down
151 changes: 83 additions & 68 deletions packages/layer-selector/src/__snapshots__/LayerSelector.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,81 +4,96 @@ exports[`LayerSelector tests > LayerSelector snapshot 1`] = `
<DocumentFragment>
<div>
<div
class="layer-selector--layers"
aria-haspopup="true"
class="layer-selector"
>
<div
class="layer-selector-item radio checkbox"
<input
alt="layers"
class="layer-selector__toggle"
src="/packages/layer-selector/src/layers.svg"
type="image"
/>
<form
class="layer-selector--hidden"
>
<label
class="layer-selector--item"
<div
class="layer-selector--layers"
>
<input
checked=""
name="baselayer"
type="radio"
value="Lite"
/>
<span
class="layer-selector-item--text"
<div
class="layer-selector-item radio checkbox"
>
Lite
</span>
</label>
</div>
<div
class="layer-selector-item radio checkbox"
>
<label
class="layer-selector--item"
>
<input
name="baselayer"
type="radio"
value="Terrain"
/>
<span
class="layer-selector-item--text"
<label
class="layer-selector--item"
>
<input
checked=""
name="baselayer"
type="radio"
value="Lite"
/>
<span
class="layer-selector-item--text"
>
Lite
</span>
</label>
</div>
<div
class="layer-selector-item radio checkbox"
>
Terrain
</span>
</label>
</div>
<div
class="layer-selector-item radio checkbox"
>
<label
class="layer-selector--item"
>
<input
name="baselayer"
type="radio"
value="Topo"
/>
<span
class="layer-selector-item--text"
<label
class="layer-selector--item"
>
<input
name="baselayer"
type="radio"
value="Terrain"
/>
<span
class="layer-selector-item--text"
>
Terrain
</span>
</label>
</div>
<div
class="layer-selector-item radio checkbox"
>
Topo
</span>
</label>
</div>
<div
class="layer-selector-item radio checkbox"
>
<label
class="layer-selector--item"
>
<input
name="baselayer"
type="radio"
value="Color IR"
/>
<span
class="layer-selector-item--text"
<label
class="layer-selector--item"
>
<input
name="baselayer"
type="radio"
value="Topo"
/>
<span
class="layer-selector-item--text"
>
Topo
</span>
</label>
</div>
<div
class="layer-selector-item radio checkbox"
>
Color IR
</span>
</label>
</div>
<label
class="layer-selector--item"
>
<input
name="baselayer"
type="radio"
value="Color IR"
/>
<span
class="layer-selector-item--text"
>
Color IR
</span>
</label>
</div>
</div>
</form>
</div>
</div>
</DocumentFragment>
Expand Down
Loading