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

Override constrainToScroll prop default value to false #586

Merged
merged 32 commits into from
Mar 22, 2024
Merged

Override constrainToScroll prop default value to false #586

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5d0e433
Override constrainToScroll prop default value to false
kafukoM Mar 21, 2024
f1b8ee0
Updated default constrainToScrollParent prop value
kafukoM Mar 22, 2024
837d6e2
Reverted yarn.lock changes
kafukoM Mar 22, 2024
44409f6
Modified changelog.md
kafukoM Mar 22, 2024
ec8cf3b
Revert "Modified changelog.md"
kafukoM Mar 22, 2024
996d695
Updated CHANGELOG.md
kafukoM Mar 22, 2024
b577fa8
Move dimension styles to the container
MisRob Jul 26, 2023
f9fcaf0
Add scaling and ratio logic
MisRob Jul 26, 2023
8ea6972
Document default slot
MisRob Nov 22, 2023
e358e4b
Add slots and placeholder logic
MisRob Nov 22, 2023
3d3107a
Add border radius
MisRob Jan 12, 2024
1b51e44
Cleanup documentation and tests
MisRob Jan 31, 2024
86a55a3
Trying with hidden overflow flex wrapper
AlexVelezLl Feb 20, 2024
3f55c9e
Overflow items with visibility hidden items
AlexVelezLl Feb 20, 2024
98018f4
Ensuring all visible items if moreButton were not rendered
AlexVelezLl Feb 20, 2024
bcf6fa2
Polishing example
AlexVelezLl Feb 20, 2024
ce80b6a
Add docs page
AlexVelezLl Feb 21, 2024
4b20918
Add divider support
AlexVelezLl Feb 21, 2024
add2f37
Add appearance overrides
AlexVelezLl Feb 21, 2024
5f9fd92
Add useKResponsiveElement
AlexVelezLl Feb 27, 2024
4ad6e9d
Watch responsive elementWidth in KListWithOverflow
AlexVelezLl Feb 27, 2024
4c0850d
Update docs
AlexVelezLl Feb 27, 2024
e3cfdb3
Add component documentation
AlexVelezLl Feb 27, 2024
691b74a
Add changelog
AlexVelezLl Feb 27, 2024
f3690dd
Lint files
AlexVelezLl Feb 27, 2024
e24ea56
Rename composable to private
AlexVelezLl Feb 27, 2024
5f25479
Set list as overflow hidden
AlexVelezLl Feb 27, 2024
b4d4ea2
Replace ResizeSensor
AlexVelezLl Feb 28, 2024
f8b5ef8
Requested changes
AlexVelezLl Feb 29, 2024
76c72de
Increase version
MisRob Mar 5, 2024
8dbb67b
Resolved CHANGELOG.md conflicts
kafukoM Mar 22, 2024
883ab3d
Merge branch 'release-v3' into kdropdown-options-update
kafukoM Mar 22, 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
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ Changelog is rather internal in nature. See release notes for the public overvie

## Version 3.x.x (`release-v3` branch)

- [#586]
- **Description:** Adds a new prop `constrainToScrollParent ` to `KDropdownMenu` to allow overriding of its popover flipping behavior.
- **Products impact:** Bugfix
- **Addresses:** [#432](https://github.com/learningequality/kolibri-design-system/issues/432)
- **Components:** KDropdownMenu
- **Breaking:** no
- **Impacts a11y:** no
- **Guidance:** Use the `constrainToScrollParent` prop to override the default popover flipping behavior of the `KDropdownMenu` component prop where necessary.

[#586]: https://github.com/learningequality/kolibri-design-system/pull/586

- [#557]
- **Description:** Updates development documentation in regards to linking products development servers to local KDS
- **Products impact:** -
Expand Down
8 changes: 8 additions & 0 deletions lib/KDropdownMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
:z-index="99"
:containFocus="true"
:dropdownPosition="position"
:constrainToScrollParent="constrainToScrollParent"
@close="handleClose"
@open="handleOpen"
>
Expand Down Expand Up @@ -34,6 +35,13 @@
UiMenu,
},
props: {
/**
* The dropdown menu popover flips its position to avoid overflows within the parent. Setting it to false disables the flipping behavior.
*/
constrainToScrollParent: {
type: Boolean,
default: true,
},
/**
* An array of options objects, with one object per dropdown item
*/
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we want to be changing yarn.lock as part of this task. Could you please revert?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@MisRob I have reverted the commit, leaving out the yarn.lock changes

Copy link
Member

Choose a reason for hiding this comment

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

@kafukoM I think this change on yarn.lock is still present

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@akolson @MisRob The new commit should have reverted the changes on the yarn.lock file

Copy link
Member

Choose a reason for hiding this comment

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

Thanks @kafukoM, although It looks like we picked up some conflicts in the process.

Copy link
Member

Choose a reason for hiding this comment

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

It looks like you are not having some changelog entries. All the below should be present in your version of the changelog

- [#586]
  - **Description:** Adds a new prop `constrainToScrollParent ` to `KDropdownMenu` to allow overriding of its popover flipping behavior.
  - **Products impact:** Bugfix
  - **Addresses:** [#432](https://github.com/learningequality/kolibri-design-system/issues/432)
  - **Components:** KDropdownMenu
  - **Breaking:** no
  - **Impacts a11y:**  no
  - **Guidance:** Use the `constrainToScrollParent` prop to override the default popover flipping behavior of the `KDropdownMenu` component prop where necessary.

[#586]: https://github.com/learningequality/kolibri-design-system/pull/586

- [#552]
  - **Description:** New `KListWithOverflow` component.
  - **Products impact:** new API.
  - **Addresses:** https://github.com/learningequality/kolibri-design-system/issues/556, https://github.com/learningequality/studio/issues/3423, https://github.com/learningequality/kolibri/issues/11923.
  - **Components:** KListWithOverflow.
  - **Breaking:** no.
  - **Impacts a11y:** no.
  - **Guidance:** -.

[#552]: https://github.com/learningequality/kolibri-design-system/pull/552

- [#552]
  - **Description:** New `useKResponsiveElement` private composable, `KResponsiveElementMixin` translated to this composable.
  - **Products impact:** -.
  - **Addresses:** -.
  - **Components:** -.
  - **Breaking:** no.
  - **Impacts a11y:** no.
  - **Guidance:** -.

[#552]: https://github.com/learningequality/kolibri-design-system/pull/552

- [#538]
  - **Description:** Complete KImg implementation
  - **Products impact:** new API
  - **Addresses:** https://github.com/learningequality/kolibri-design-system/issues/368
  - **Components:** KImg
  - **Breaking:** no
  - **Impacts a11y:** yes
  - **Guidance:** One of the benefits of using KImg is that it throws a11y related warnings

[#538]: https://github.com/learningequality/kolibri-design-system/pull/538

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@akolson I have updated my changelog file with the latest commit

Copy link
Member

@akolson akolson Mar 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@kafukoM, the above was only intended as a guide for you when resolving the conflict locally, my apologies for any confusion. Could you please revert your most recent commit and do the following?

  1. git rebase release-v3 or git merge release-v3. This will bring in any changes you don't have
  2. Resolve the conflicts,
  3. commit the changes
  4. Finally, push

Another more straightforward option would be to undo all changes made in the changelog, then rebase or merge release-v3 into your branch after which you can add the changelog here again.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@akolson I think my latest commit should have resolved the conflict

Copy link
Member

Choose a reason for hiding this comment

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

Thanks @kafukoM. please see my other comment here

Original file line number Diff line number Diff line change
Expand Up @@ -3645,9 +3645,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"

caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001016, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001254, caniuse-lite@^1.0.30001286:
version "1.0.30001346"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001346.tgz"
integrity sha512-q6ibZUO2t88QCIPayP/euuDREq+aMAxFE5S70PkrLh0iTDj/zEhgvJRKC2+CvXY6EWc6oQwUR48lL5vCW6jiXQ==
version "1.0.30001599"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001599.tgz"
integrity sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA==

capture-exit@^2.0.0:
version "2.0.0"
Expand Down