Skip to content

Commit

Permalink
Merge pull request #201 from warp-ds/next
Browse files Browse the repository at this point in the history
Release 1.4.0
  • Loading branch information
BalbinaK authored Feb 5, 2024
2 parents de15f06 + f529f08 commit cf0de69
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 34 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# [1.4.0-next.1](https://github.com/warp-ds/react/compare/v1.3.3-next.1...v1.4.0-next.1) (2024-02-05)


### Features

* **modal:** add onLeftClick prop to control left button event-handling ([#200](https://github.com/warp-ds/react/issues/200)) ([96a750b](https://github.com/warp-ds/react/commit/96a750b1303cb8db7fb767f22c43d5dd3717e206))

## [1.3.3-next.1](https://github.com/warp-ds/react/compare/v1.3.2...v1.3.3-next.1) (2024-01-31)


### Bug Fixes

* bump scroll-doctor lib to fix modal issue with scrollbars ([#199](https://github.com/warp-ds/react/issues/199)) ([e4bb6e9](https://github.com/warp-ds/react/commit/e4bb6e9f9d68d3eb2868a2c8822d4cbbb0600f91))

## [1.3.2](https://github.com/warp-ds/react/compare/v1.3.1...v1.3.2) (2024-01-25)


Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@warp-ds/react",
"version": "1.3.2",
"version": "1.4.0-next.1",
"type": "module",
"repository": "[email protected]:warp-ds/react.git",
"license": "Apache-2.0",
Expand Down Expand Up @@ -114,7 +114,7 @@
"@warp-ds/uno": "^1.6.0",
"react-focus-lock": "^2.5.2",
"resize-observer-polyfill": "^1.5.1",
"scroll-doctor": "^1.0.0"
"scroll-doctor": "^2.0.0"
},
"eik": {
"server": "https://assets.finn.no",
Expand Down
2 changes: 1 addition & 1 deletion packages/modal/src/component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export const Modal = ({
ccModal.titleButton,
ccModal.titleButtonLeft
)}
onClick={props.onDismiss}
onClick={props.onLeftClick ? props.onLeftClick : props.onDismiss}
>
<IconTableSortDown16
className={classNames(
Expand Down
5 changes: 5 additions & 0 deletions packages/modal/src/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ export type ModalProps = {
*/
onDismiss?: () => void;

/**
* Handler that is called when the user clicks the left button
*/
onLeftClick?: () => void;

/**
* Defines a string value that labels the current element. Must be set if neither `aria-labelledby` or `<ModalHeading>` is defined,
*/
Expand Down
4 changes: 4 additions & 0 deletions packages/modal/stories/Modal.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ export const WithBackAndCloseButton = () => {
left
right
onDismiss={toggleModal}
onLeftClick={() => {
console.log('left clicked');
toggleModal();
}}
title="Title of the content goes here"
footer={
<>
Expand Down
2 changes: 2 additions & 0 deletions packages/pagination/src/locales/en/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ msgstr ""
"Last-Translator: \n"
"Language-Team: \n"
"Plural-Forms: \n"
"X-Crowdin-SourceKey: msgstr\n"

#. Default screenreader message for first page button in the pagination component
#. js-lingui-explicit-id
Expand Down Expand Up @@ -54,3 +55,4 @@ msgstr "Pages"
#: packages/pagination/src/react/PrevPage.tsx:36
msgid "pagination.aria.prev-page"
msgstr "Previous page"

14 changes: 9 additions & 5 deletions packages/pagination/src/locales/fi/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@ msgid ""
msgstr ""
"POT-Creation-Date: 2023-11-28 09:50+0100\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: @lingui/cli\n"
"Language: fi\n"
"Project-Id-Version: \n"
"Project-Id-Version: 2853b3c41d7b7a59e7cd64c0153b540a\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
"Plural-Forms: \n"
"Language-Team: Finnish\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Crowdin-Project: 2853b3c41d7b7a59e7cd64c0153b540a\n"
"X-Crowdin-Project-ID: 141\n"
"X-Crowdin-Language: fi\n"
"X-Crowdin-File-ID: 15506\n"

#. Default screenreader message for first page button in the pagination component
#. js-lingui-explicit-id
Expand Down Expand Up @@ -54,3 +57,4 @@ msgstr "Sivut"
#: packages/pagination/src/react/PrevPage.tsx:36
msgid "pagination.aria.prev-page"
msgstr "Edellinen sivu"

16 changes: 10 additions & 6 deletions packages/pagination/src/locales/nb/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@ msgid ""
msgstr ""
"POT-Creation-Date: 2023-11-28 09:50+0100\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: @lingui/cli\n"
"Language: nb\n"
"Project-Id-Version: \n"
"Language: nb_NO\n"
"Project-Id-Version: 2853b3c41d7b7a59e7cd64c0153b540a\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
"Plural-Forms: \n"
"Language-Team: Norwegian Bokmal\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Crowdin-Project: 2853b3c41d7b7a59e7cd64c0153b540a\n"
"X-Crowdin-Project-ID: 141\n"
"X-Crowdin-Language: nb\n"
"X-Crowdin-File-ID: 15506\n"

#. Default screenreader message for first page button in the pagination component
#. js-lingui-explicit-id
Expand Down Expand Up @@ -54,3 +57,4 @@ msgstr "Sider"
#: packages/pagination/src/react/PrevPage.tsx:36
msgid "pagination.aria.prev-page"
msgstr "Forrige side"

49 changes: 29 additions & 20 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cf0de69

Please sign in to comment.