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

Feat - Native Select / Select - Supporting additional content #1159

Merged
merged 11 commits into from
Nov 29, 2023
Merged

Feat - Native Select / Select - Supporting additional content #1159

merged 11 commits into from
Nov 29, 2023

Conversation

chris-cedrone-cengage
Copy link
Collaborator

@chris-cedrone-cengage chris-cedrone-cengage commented Nov 9, 2023 •
edited
Loading

Issue: 1114

What I did

  • Added support for Native Select & Select components to allow additional content.

Still:

oy

Checklist

  • changeset has been added
  • Pull request description is descriptive
  • I have made corresponding changes to the documentation
  • New and existing unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works

How to test

  • Go into Docs > Native Select || Select > Open up the Codesandbox example under "Additional Content"
  • Test that elements are permitted within additionalContent={}

@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Nov 9, 2023 •
edited
Loading

🦋 Changeset detected

Latest commit: 62582af

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 9, 2023

🚀 Deployed on https://docs-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 9, 2023

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://docs-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

silvalaura
silvalaura requested changes Nov 15, 2023
View reviewed changes
package-lock.json Outdated Show resolved Hide resolved
.changeset/feat-selectChildren.md Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/NativeSelect/NativeSelect.stories.tsx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/Select/Select.tsx Outdated Show resolved Hide resolved
website/react-magma-docs/src/pages/api/select.mdx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/Select/index.tsx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/Select/Select.stories.tsx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/NativeSelect/NativeSelect.tsx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/NativeSelect/NativeSelect.tsx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/NativeSelect/NativeSelect.tsx Outdated Show resolved Hide resolved
@chris-cedrone-cengage chris-cedrone-cengage marked this pull request as ready for review November 17, 2023 16:29
@chris-cedrone-cengage chris-cedrone-cengage requested a review from a team as a code owner November 17, 2023 16:29
@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://docs-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

silvalaura
silvalaura reviewed Nov 17, 2023
View reviewed changes
.changeset/feat-selectChildren.md Outdated Show resolved Hide resolved
package-lock.json Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/NativeSelect/NativeSelect.stories.tsx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/NativeSelect/NativeSelect.test.js Show resolved Hide resolved
packages/react-magma-dom/src/components/NativeSelect/NativeSelect.tsx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/Select/index.tsx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/Select/index.tsx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/Select/index.tsx Outdated Show resolved Hide resolved
website/react-magma-docs/src/pages/api/native-select.mdx Outdated Show resolved Hide resolved
website/react-magma-docs/src/pages/api/select.mdx Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://docs-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

silvalaura
silvalaura reviewed Nov 28, 2023
View reviewed changes
package-lock.json Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/NativeSelect/NativeSelect.tsx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/NativeSelect/NativeSelect.tsx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/NativeSelect/NativeSelect.tsx Outdated
Comment on lines 204 to 205
{(labelPosition === LabelPosition.left && additionalContent) ||
(!labelText && additionalContent)}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can touch up this logic to be a little cleaner :) (same logic, just re-organized)

packages/react-magma-dom/src/components/Select/Select.stories.tsx Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/Select/Select.test.js Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/Select/Select.test.js Outdated Show resolved Hide resolved
packages/react-magma-dom/src/components/Select/Select.test.js Outdated Show resolved Hide resolved
website/react-magma-docs/src/pages/api/native-select.mdx Outdated Show resolved Hide resolved
website/react-magma-docs/src/pages/api/select.mdx Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://docs-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@chris-cedrone-cengage
trying to undo the package-lock commit accident tragedy, using ID fro…
fbdcb7f 
…m git log which is previous to my committed version
@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://docs-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://docs-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://docs-preview-1159--upbeat-sinoussi-f675aa.netlify.app

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://docs-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://docs-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://docs-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://docs-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed on https://storybook-preview-1159--upbeat-sinoussi-f675aa.netlify.app

@chris-cedrone-cengage chris-cedrone-cengage merged commit c47fc18 into dev Nov 29, 2023
11 checks passed
chris-cedrone-cengage added a commit that referenced this pull request Jan 19, 2024
@chris-cedrone-cengage
Feat - Native Select / Select - Supporting additional content (#1159)
b9dccbd
silvalaura pushed a commit that referenced this pull request Jan 19, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
28899ba
silvalaura pushed a commit that referenced this pull request Jan 22, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
ef243ba
@silvalaura silvalaura mentioned this pull request Feb 27, 2024
Closed
silvalaura pushed a commit that referenced this pull request Jun 5, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
36d8a6e
silvalaura pushed a commit that referenced this pull request Jun 18, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
defe8dd
silvalaura pushed a commit that referenced this pull request Jun 18, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
e8f3d37
silvalaura pushed a commit that referenced this pull request Jun 20, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
84b97b5
@silvalaura silvalaura deleted the feat/selectChildren branch July 25, 2024 17:44
silvalaura pushed a commit that referenced this pull request Aug 15, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
e5dce1f
silvalaura pushed a commit that referenced this pull request Sep 18, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
10920a0
silvalaura pushed a commit that referenced this pull request Sep 18, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
ff1795d
silvalaura pushed a commit that referenced this pull request Sep 18, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
e40a414
silvalaura pushed a commit that referenced this pull request Sep 18, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
9a5c4fd
silvalaura pushed a commit that referenced this pull request Sep 18, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
0f24097
silvalaura pushed a commit that referenced this pull request Dec 16, 2024
@chris-cedrone-cengage @silvalaura
Feat - Native Select / Select - Supporting additional content (#1159)
b7299b5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@silvalaura silvalaura silvalaura approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@chris-cedrone-cengage @silvalaura