diff --git a/packages/modules/data-widgets/CHANGELOG.md b/packages/modules/data-widgets/CHANGELOG.md index 2d707458fd..7381257d86 100644 --- a/packages/modules/data-widgets/CHANGELOG.md +++ b/packages/modules/data-widgets/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Changed + +- We replaced glyphicons with internal icons + ## [2.7.2] DataWidgets - 2023-05-02 ### [2.7.1] Datagrid diff --git a/packages/modules/data-widgets/package.json b/packages/modules/data-widgets/package.json index d1ce43abb5..9f01e2ad2d 100644 --- a/packages/modules/data-widgets/package.json +++ b/packages/modules/data-widgets/package.json @@ -1,7 +1,7 @@ { "name": "@mendix/data-widgets", "moduleName": "Data Widgets", - "version": "2.7.2", + "version": "2.7.3", "license": "Apache-2.0", "copyright": "© Mendix Technology BV 2023. All rights reserved.", "private": true, diff --git a/packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid-filters.scss b/packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid-filters.scss index 72bc933337..5f2831fccb 100644 --- a/packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid-filters.scss +++ b/packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid-filters.scss @@ -29,6 +29,10 @@ $item-min-height: 32px; .btn-calendar { margin-left: 5px; //Review in atlas, the current date picker is also 5px + .button-icon { + width: 18px; + height: 18px; + } } } diff --git a/packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid.scss b/packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid.scss index 689c8e3c95..acfc199dce 100644 --- a/packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid.scss +++ b/packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid.scss @@ -313,6 +313,13 @@ $grid-selected-row-background: $brand-light; outline: 1px solid $brand-primary; } } + .pagination-icon { + position: relative; + top: 4px; + display: inline-block; + width: 20px; + height: 20px; + } } /* Column selector for hidable columns outside DG context */ diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/CHANGELOG.md b/packages/pluggableWidgets/datagrid-date-filter-web/CHANGELOG.md index 7043f3242a..30065e0c18 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/CHANGELOG.md +++ b/packages/pluggableWidgets/datagrid-date-filter-web/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Changed + +- We replaced glyphicons with internal icons + ## [2.5.0] - 2023-05-01 ### Fixed diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/cypress-visual-screenshots/baseline/DataGridDateFilter.spec-dataGridDateFilter-chrome.png b/packages/pluggableWidgets/datagrid-date-filter-web/cypress-visual-screenshots/baseline/DataGridDateFilter.spec-dataGridDateFilter-chrome.png index f65fdbd95b..09974cb087 100755 Binary files a/packages/pluggableWidgets/datagrid-date-filter-web/cypress-visual-screenshots/baseline/DataGridDateFilter.spec-dataGridDateFilter-chrome.png and b/packages/pluggableWidgets/datagrid-date-filter-web/cypress-visual-screenshots/baseline/DataGridDateFilter.spec-dataGridDateFilter-chrome.png differ diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/cypress-visual-screenshots/baseline/DataGridDateFilter.spec-dataGridDateFilterDatePicker-chrome.png b/packages/pluggableWidgets/datagrid-date-filter-web/cypress-visual-screenshots/baseline/DataGridDateFilter.spec-dataGridDateFilterDatePicker-chrome.png index 6126906f02..a3ee80590c 100755 Binary files a/packages/pluggableWidgets/datagrid-date-filter-web/cypress-visual-screenshots/baseline/DataGridDateFilter.spec-dataGridDateFilterDatePicker-chrome.png and b/packages/pluggableWidgets/datagrid-date-filter-web/cypress-visual-screenshots/baseline/DataGridDateFilter.spec-dataGridDateFilterDatePicker-chrome.png differ diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/package.json b/packages/pluggableWidgets/datagrid-date-filter-web/package.json index 475c903f19..858d605213 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/package.json +++ b/packages/pluggableWidgets/datagrid-date-filter-web/package.json @@ -1,7 +1,7 @@ { "name": "@mendix/datagrid-date-filter-web", "widgetName": "DatagridDateFilter", - "version": "2.5.0", + "version": "2.5.1", "description": "", "copyright": "© Mendix Technology BV 2023. All rights reserved.", "private": true, diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/CalendarIcon.tsx b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/CalendarIcon.tsx new file mode 100644 index 0000000000..08e4892d78 --- /dev/null +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/CalendarIcon.tsx @@ -0,0 +1,12 @@ +import { createElement } from "react"; + +export default function CalendarIcon() { + return ( + + + + ); +} diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/DatePicker.tsx b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/DatePicker.tsx index 0173911b4f..6ea1408069 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/DatePicker.tsx +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/DatePicker.tsx @@ -17,6 +17,7 @@ import { isDate, isValid } from "date-fns"; import { createPortal } from "react-dom"; import replaceAllInserter from "string.prototype.replaceall"; import { doubleMonthOrDayWhenSingle } from "../utils/utils"; +import CalendarIcon from "./CalendarIcon"; export type RangeDateValue = [Date | undefined, Date | undefined]; @@ -147,7 +148,7 @@ export const DatePicker = forwardRef( } }} > - + ); diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/__snapshots__/DatagridDateFilter.spec.tsx.snap b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/__snapshots__/DatagridDateFilter.spec.tsx.snap index c10270c8aa..307c6e612e 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/__snapshots__/DatagridDateFilter.spec.tsx.snap +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/__snapshots__/DatagridDateFilter.spec.tsx.snap @@ -52,9 +52,16 @@ exports[`Date Filter with single instance with multiple attributes renders corre aria-label="Show calendar" class="btn btn-default btn-calendar" > - + + + @@ -112,9 +119,16 @@ exports[`Date Filter with single instance with single attribute renders correctl aria-label="Show calendar" class="btn btn-default btn-calendar" > - + + + diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/__snapshots__/DatePicker.spec.tsx.snap b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/__snapshots__/DatePicker.spec.tsx.snap index 281b719d1f..0d00e8826e 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/__snapshots__/DatePicker.spec.tsx.snap +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/__snapshots__/DatePicker.spec.tsx.snap @@ -32,9 +32,16 @@ Array [ aria-label="Show calendar" class="btn btn-default btn-calendar" > - + + + , ] `; @@ -71,9 +78,16 @@ Array [ aria-label="Show calendar" class="btn btn-default btn-calendar" > - + + + , ] `; @@ -112,9 +126,16 @@ Array [ aria-label="my calendar" class="btn btn-default btn-calendar" > - + + + , ] `; @@ -151,9 +172,16 @@ Array [ aria-label="Show calendar" class="btn btn-default btn-calendar" > - + + + , ] `; diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/__snapshots__/FilterComponent.spec.tsx.snap b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/__snapshots__/FilterComponent.spec.tsx.snap index 2d5b2eed1e..e24f0cd358 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/__snapshots__/FilterComponent.spec.tsx.snap +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/__snapshots__/FilterComponent.spec.tsx.snap @@ -51,9 +51,16 @@ exports[`Filter component renders correctly 1`] = ` aria-label="Show calendar" class="btn btn-default btn-calendar" > - + + + `; @@ -93,9 +100,16 @@ exports[`Filter component renders correctly when not adjustable by user 1`] = ` aria-label="Show calendar" class="btn btn-default btn-calendar" > - + + + `; @@ -154,9 +168,16 @@ exports[`Filter component renders correctly with aria labels 1`] = ` aria-label="Show calendar" class="btn btn-default btn-calendar" > - + + + `; diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/package.xml b/packages/pluggableWidgets/datagrid-date-filter-web/src/package.xml index 6cbad36fa9..ec6ca11136 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/package.xml +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/package.xml @@ -1,6 +1,6 @@ - + diff --git a/packages/pluggableWidgets/datagrid-web/CHANGELOG.md b/packages/pluggableWidgets/datagrid-web/CHANGELOG.md index 0a73bb2878..0cdb40e791 100644 --- a/packages/pluggableWidgets/datagrid-web/CHANGELOG.md +++ b/packages/pluggableWidgets/datagrid-web/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Changed + +- We replaced glyphicons with internal icons + ## [2.7.1] - 2023-05-02 ### Added diff --git a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-dataGridColumnContent-chrome.png b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-dataGridColumnContent-chrome.png index 7988191373..666c0b5246 100755 Binary files a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-dataGridColumnContent-chrome.png and b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-dataGridColumnContent-chrome.png differ diff --git a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-dataGridColumnContent-firefox.png b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-dataGridColumnContent-firefox.png index cbe8c25849..bdf06cb3d4 100755 Binary files a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-dataGridColumnContent-firefox.png and b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-dataGridColumnContent-firefox.png differ diff --git a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-datagrid-chrome.png b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-datagrid-chrome.png index bc482a191e..f4b5ead8ef 100755 Binary files a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-datagrid-chrome.png and b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-datagrid-chrome.png differ diff --git a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-datagrid-firefox.png b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-datagrid-firefox.png index 478732fa72..5f8a43d5fe 100755 Binary files a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-datagrid-firefox.png and b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGrid.spec-datagrid-firefox.png differ diff --git a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringIntegration.spec-datagrid-chrome.png b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringIntegration.spec-datagrid-chrome.png index 6b47ac4591..d189004a7f 100755 Binary files a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringIntegration.spec-datagrid-chrome.png and b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringIntegration.spec-datagrid-chrome.png differ diff --git a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringIntegration.spec-datagrid-firefox.png b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringIntegration.spec-datagrid-firefox.png index 904710ec9e..5778d398e3 100755 Binary files a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringIntegration.spec-datagrid-firefox.png and b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringIntegration.spec-datagrid-firefox.png differ diff --git a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringSingle.spec-datagrid-chrome.png b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringSingle.spec-datagrid-chrome.png index 5175bc7f0c..b93702daa9 100755 Binary files a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringSingle.spec-datagrid-chrome.png and b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringSingle.spec-datagrid-chrome.png differ diff --git a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringSingle.spec-datagrid-firefox.png b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringSingle.spec-datagrid-firefox.png index 4ae437b442..7b1cd455e0 100755 Binary files a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringSingle.spec-datagrid-firefox.png and b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridFilteringSingle.spec-datagrid-firefox.png differ diff --git a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridMultiSelectionCheckbox-chrome.png b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridMultiSelectionCheckbox-chrome.png index f7abf04e8f..fcd8d5b608 100755 Binary files a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridMultiSelectionCheckbox-chrome.png and b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridMultiSelectionCheckbox-chrome.png differ diff --git a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridMultiSelectionRowClick-chrome.png b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridMultiSelectionRowClick-chrome.png index ce204f6293..ed9a70c208 100755 Binary files a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridMultiSelectionRowClick-chrome.png and b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridMultiSelectionRowClick-chrome.png differ diff --git a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridSingleSelectionCheckbox-chrome.png b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridSingleSelectionCheckbox-chrome.png index 62e1ae20d8..e665738239 100755 Binary files a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridSingleSelectionCheckbox-chrome.png and b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridSingleSelectionCheckbox-chrome.png differ diff --git a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridSingleSelectionRowClick-chrome.png b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridSingleSelectionRowClick-chrome.png index 48a63f4bb6..339ab3df84 100755 Binary files a/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridSingleSelectionRowClick-chrome.png and b/packages/pluggableWidgets/datagrid-web/cypress-visual-screenshots/baseline/DataGridSelection.spec-datagridSingleSelectionRowClick-chrome.png differ diff --git a/packages/pluggableWidgets/datagrid-web/package.json b/packages/pluggableWidgets/datagrid-web/package.json index 569cd6e937..94e103656b 100644 --- a/packages/pluggableWidgets/datagrid-web/package.json +++ b/packages/pluggableWidgets/datagrid-web/package.json @@ -1,7 +1,7 @@ { "name": "@mendix/datagrid-web", "widgetName": "Datagrid", - "version": "2.7.1", + "version": "2.7.2", "description": "", "copyright": "© Mendix Technology BV 2023. All rights reserved.", "private": true, diff --git a/packages/pluggableWidgets/datagrid-web/src/components/__tests__/__snapshots__/Table.spec.tsx.snap b/packages/pluggableWidgets/datagrid-web/src/components/__tests__/__snapshots__/Table.spec.tsx.snap index 6a7c602677..0cc3939ab2 100644 --- a/packages/pluggableWidgets/datagrid-web/src/components/__tests__/__snapshots__/Table.spec.tsx.snap +++ b/packages/pluggableWidgets/datagrid-web/src/components/__tests__/__snapshots__/Table.spec.tsx.snap @@ -838,8 +838,23 @@ exports[`Table renders the structure correctly with paging 1`] = ` > @@ -1124,8 +1169,23 @@ exports[`Table with selection method checkbox render an extra column and add cla > @@ -1259,8 +1349,23 @@ exports[`Table with selection method rowClick add class to each selected cell 1` > diff --git a/packages/pluggableWidgets/datagrid-web/src/package.xml b/packages/pluggableWidgets/datagrid-web/src/package.xml index 47179ddf2d..33241a3cee 100644 --- a/packages/pluggableWidgets/datagrid-web/src/package.xml +++ b/packages/pluggableWidgets/datagrid-web/src/package.xml @@ -1,6 +1,6 @@ - + diff --git a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryContent-chrome.png b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryContent-chrome.png index fb18a30e09..b4b31efea6 100755 Binary files a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryContent-chrome.png and b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryContent-chrome.png differ diff --git a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryDateFilter-chrome.png b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryDateFilter-chrome.png index 152ab49c82..0bbc867b9a 100755 Binary files a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryDateFilter-chrome.png and b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryDateFilter-chrome.png differ diff --git a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryDropdownFilter-chrome.png b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryDropdownFilter-chrome.png index f9106deeae..703a53a3b6 100755 Binary files a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryDropdownFilter-chrome.png and b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryDropdownFilter-chrome.png differ diff --git a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryDropdownSort-chrome.png b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryDropdownSort-chrome.png index 4d9a0468c3..34cfb1ab3e 100755 Binary files a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryDropdownSort-chrome.png and b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryDropdownSort-chrome.png differ diff --git a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryNumberFilter-chrome.png b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryNumberFilter-chrome.png index 94bc07eb58..7d7b0d5681 100755 Binary files a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryNumberFilter-chrome.png and b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryNumberFilter-chrome.png differ diff --git a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryTextFilter-chrome.png b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryTextFilter-chrome.png index 6f1bcdc560..dcc5ff387b 100755 Binary files a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryTextFilter-chrome.png and b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/Gallery.spec-galleryTextFilter-chrome.png differ diff --git a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/GallerySelection.spec-galleryMultiSelection-chrome.png b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/GallerySelection.spec-galleryMultiSelection-chrome.png index d05de91be1..1a27368a13 100755 Binary files a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/GallerySelection.spec-galleryMultiSelection-chrome.png and b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/GallerySelection.spec-galleryMultiSelection-chrome.png differ diff --git a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/GallerySelection.spec-gallerySingleSelection-chrome.png b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/GallerySelection.spec-gallerySingleSelection-chrome.png index 1a2794e2a9..d289588f96 100755 Binary files a/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/GallerySelection.spec-gallerySingleSelection-chrome.png and b/packages/pluggableWidgets/gallery-web/cypress-visual-screenshots/baseline/GallerySelection.spec-gallerySingleSelection-chrome.png differ diff --git a/packages/pluggableWidgets/gallery-web/src/components/__tests__/Gallery.spec.tsx b/packages/pluggableWidgets/gallery-web/src/components/__tests__/Gallery.spec.tsx index 13536addcc..75e6bc52ec 100644 --- a/packages/pluggableWidgets/gallery-web/src/components/__tests__/Gallery.spec.tsx +++ b/packages/pluggableWidgets/gallery-web/src/components/__tests__/Gallery.spec.tsx @@ -142,7 +142,7 @@ describe("Gallery", () => { setPage={setPage} /> ); - const galleryFirstItem = gallery.find(".glyphicon-step-forward").at(0); + const galleryFirstItem = gallery.find(".step-forward").at(0); expect(galleryFirstItem).toBeDefined(); diff --git a/packages/pluggableWidgets/gallery-web/src/components/__tests__/__snapshots__/Gallery.spec.tsx.snap b/packages/pluggableWidgets/gallery-web/src/components/__tests__/__snapshots__/Gallery.spec.tsx.snap index df6b5ec0b8..0b60b51232 100644 --- a/packages/pluggableWidgets/gallery-web/src/components/__tests__/__snapshots__/Gallery.spec.tsx.snap +++ b/packages/pluggableWidgets/gallery-web/src/components/__tests__/__snapshots__/Gallery.spec.tsx.snap @@ -151,8 +151,23 @@ exports[`Gallery with pagination renders correctly 1`] = ` > diff --git a/packages/pluggableWidgets/language-selector-web/cypress-visual-screenshots/baseline/LanguageSelector.spec-languageSelector-chrome.png b/packages/pluggableWidgets/language-selector-web/cypress-visual-screenshots/baseline/LanguageSelector.spec-languageSelector-chrome.png index d387aeb78f..ab56ec5b93 100755 Binary files a/packages/pluggableWidgets/language-selector-web/cypress-visual-screenshots/baseline/LanguageSelector.spec-languageSelector-chrome.png and b/packages/pluggableWidgets/language-selector-web/cypress-visual-screenshots/baseline/LanguageSelector.spec-languageSelector-chrome.png differ diff --git a/packages/pluggableWidgets/language-selector-web/cypress-visual-screenshots/baseline/LanguageSelector.spec-languageSelectorArabic-chrome.png b/packages/pluggableWidgets/language-selector-web/cypress-visual-screenshots/baseline/LanguageSelector.spec-languageSelectorArabic-chrome.png index d7fc56f162..686a2d63d4 100755 Binary files a/packages/pluggableWidgets/language-selector-web/cypress-visual-screenshots/baseline/LanguageSelector.spec-languageSelectorArabic-chrome.png and b/packages/pluggableWidgets/language-selector-web/cypress-visual-screenshots/baseline/LanguageSelector.spec-languageSelectorArabic-chrome.png differ diff --git a/packages/pluggableWidgets/language-selector-web/cypress-visual-screenshots/baseline/LanguageSelector.spec-languageSelectorChinese-chrome.png b/packages/pluggableWidgets/language-selector-web/cypress-visual-screenshots/baseline/LanguageSelector.spec-languageSelectorChinese-chrome.png index 8dce1e88d3..34b6f91f40 100755 Binary files a/packages/pluggableWidgets/language-selector-web/cypress-visual-screenshots/baseline/LanguageSelector.spec-languageSelectorChinese-chrome.png and b/packages/pluggableWidgets/language-selector-web/cypress-visual-screenshots/baseline/LanguageSelector.spec-languageSelectorChinese-chrome.png differ diff --git a/packages/pluggableWidgets/rating-web/CHANGELOG.md b/packages/pluggableWidgets/rating-web/CHANGELOG.md index e6564422a2..5f7322e1c6 100644 --- a/packages/pluggableWidgets/rating-web/CHANGELOG.md +++ b/packages/pluggableWidgets/rating-web/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Changed + +- We replaced glyphicons to internal icons + ## [3.1.1] - 2022-04-01 ### Fixed diff --git a/packages/pluggableWidgets/rating-web/package.json b/packages/pluggableWidgets/rating-web/package.json index 039b37b26b..f17a2ef5a9 100644 --- a/packages/pluggableWidgets/rating-web/package.json +++ b/packages/pluggableWidgets/rating-web/package.json @@ -1,7 +1,7 @@ { "name": "@mendix/rating-web", "widgetName": "StarRating", - "version": "3.1.1", + "version": "3.1.2", "description": "Displays a rating mechanism with icons", "copyright": "© Mendix Technology BV 2023. All rights reserved.", "license": "Apache-2.0", diff --git a/packages/pluggableWidgets/rating-web/src/StarRating.editorPreview.tsx b/packages/pluggableWidgets/rating-web/src/StarRating.editorPreview.tsx index f10af0508f..52a1a73394 100644 --- a/packages/pluggableWidgets/rating-web/src/StarRating.editorPreview.tsx +++ b/packages/pluggableWidgets/rating-web/src/StarRating.editorPreview.tsx @@ -11,12 +11,12 @@ export function preview(props: StarRatingPreviewProps): ReactElement { const emptyIcon = props.emptyIcon ? ( ) : ( - + ); const fullIcon = props.icon ? ( ) : ( - + ); return ( diff --git a/packages/pluggableWidgets/rating-web/src/StarRating.tsx b/packages/pluggableWidgets/rating-web/src/StarRating.tsx index c39384806e..6d324ee73d 100644 --- a/packages/pluggableWidgets/rating-web/src/StarRating.tsx +++ b/packages/pluggableWidgets/rating-web/src/StarRating.tsx @@ -13,13 +13,13 @@ export function StarRating(props: StarRatingContainerProps): ReactElement { props.emptyIcon && isAvailable(props.emptyIcon) ? ( ) : ( - + ); const fullIcon = props.icon && isAvailable(props.icon) ? ( ) : ( - + ); const onChange = useCallback( diff --git a/packages/pluggableWidgets/rating-web/src/components/Icon.tsx b/packages/pluggableWidgets/rating-web/src/components/Icon.tsx index c5124c0a35..0a51a37608 100644 --- a/packages/pluggableWidgets/rating-web/src/components/Icon.tsx +++ b/packages/pluggableWidgets/rating-web/src/components/Icon.tsx @@ -1,21 +1,23 @@ -import { createElement, ReactElement } from "react"; +import { Icon as InternalIcon } from "@mendix/pluggable-widgets-commons/components/web"; import classNames from "classnames"; import { WebIcon } from "mendix"; -import { Icon as InternalIcon } from "@mendix/pluggable-widgets-commons/components/web"; +import { ReactElement, createElement } from "react"; +import { StarIcon } from "./StarIcon"; interface IconProps { animate?: boolean; empty?: boolean; full?: boolean; - value: WebIcon; + value?: WebIcon; } export function Icon({ animate, empty, full, value }: IconProps): ReactElement { let className; - if (value && value.type === "glyph") { + if (value?.type === "icon") { className = classNames("rating-icon", { "rating-icon-empty": empty, "rating-icon-full": full, animate }); + return ; } - if (value && value.type === "image") { + if (value?.type === "image") { className = classNames("rating-image", { "rating-image-empty": empty, "rating-image-full": full, diff --git a/packages/pluggableWidgets/rating-web/src/components/StarIcon.tsx b/packages/pluggableWidgets/rating-web/src/components/StarIcon.tsx new file mode 100644 index 0000000000..cc925af3b5 --- /dev/null +++ b/packages/pluggableWidgets/rating-web/src/components/StarIcon.tsx @@ -0,0 +1,23 @@ +import { createElement, ReactElement } from "react"; + +type StarIconProps = { + className: string; + empty: boolean | undefined; + full: boolean | undefined; +}; + +export function StarIcon({ className, empty }: StarIconProps): ReactElement { + return empty ? ( + + + + + + ) : ( + + + + + + ); +} diff --git a/packages/pluggableWidgets/rating-web/src/components/__tests__/__snapshots__/StarRating.spec.tsx.snap b/packages/pluggableWidgets/rating-web/src/components/__tests__/__snapshots__/StarRating.spec.tsx.snap index 1c759615de..d19ce8b1a5 100644 --- a/packages/pluggableWidgets/rating-web/src/components/__tests__/__snapshots__/StarRating.spec.tsx.snap +++ b/packages/pluggableWidgets/rating-web/src/components/__tests__/__snapshots__/StarRating.spec.tsx.snap @@ -11,8 +11,8 @@ exports[`Rating Container renders correctly the structure 1`] = ` empty={true} value={ Object { - "iconClass": "glyphicon-star-empty", - "type": "glyph", + "iconClass": "", + "type": "icon", } } /> @@ -23,8 +23,8 @@ exports[`Rating Container renders correctly the structure 1`] = ` full={true} value={ Object { - "iconClass": "glyphicon-star", - "type": "glyph", + "iconClass": "", + "type": "icon", } } /> @@ -47,8 +47,8 @@ exports[`Rating Container renders correctly the structure when disabled 1`] = ` empty={true} value={ Object { - "iconClass": "glyphicon-star-empty", - "type": "glyph", + "iconClass": "", + "type": "icon", } } /> @@ -59,8 +59,8 @@ exports[`Rating Container renders correctly the structure when disabled 1`] = ` full={true} value={ Object { - "iconClass": "glyphicon-star", - "type": "glyph", + "iconClass": "", + "type": "icon", } } /> @@ -83,8 +83,8 @@ exports[`Rating Container renders correctly the structure without animation 1`] empty={true} value={ Object { - "iconClass": "glyphicon-star-empty", - "type": "glyph", + "iconClass": "", + "type": "icon", } } /> @@ -95,8 +95,8 @@ exports[`Rating Container renders correctly the structure without animation 1`] full={true} value={ Object { - "iconClass": "glyphicon-star", - "type": "glyph", + "iconClass": "", + "type": "icon", } } /> diff --git a/packages/pluggableWidgets/rating-web/src/package.xml b/packages/pluggableWidgets/rating-web/src/package.xml index e938984f92..238dc3f54c 100644 --- a/packages/pluggableWidgets/rating-web/src/package.xml +++ b/packages/pluggableWidgets/rating-web/src/package.xml @@ -1,6 +1,6 @@ - + diff --git a/packages/pluggableWidgets/rating-web/src/ui/rating-main.scss b/packages/pluggableWidgets/rating-web/src/ui/rating-main.scss index 44eec9258f..1792fce7ca 100644 --- a/packages/pluggableWidgets/rating-web/src/ui/rating-main.scss +++ b/packages/pluggableWidgets/rating-web/src/ui/rating-main.scss @@ -53,7 +53,10 @@ Styles when icon is selected in Studio/Studio Pro */ .rating-icon { - font-size: 24px; + svg { + width: 24px; + height: 24px; + } transform: scale(1); } diff --git a/packages/shared/pluggable-widgets-commons/src/components/web/ControlIcon.tsx b/packages/shared/pluggable-widgets-commons/src/components/web/ControlIcon.tsx new file mode 100644 index 0000000000..7f70af8c41 --- /dev/null +++ b/packages/shared/pluggable-widgets-commons/src/components/web/ControlIcon.tsx @@ -0,0 +1,84 @@ +import { ReactElement, createElement } from "react"; + +export default function ControlIcon({ direction }: { direction: string }): ReactElement { + const classNames = `pagination-icon ${direction}`; + switch (direction) { + case "forward": + return ( + + + + + + + ); + case "step-forward": + return ( + + + + + + + ); + case "backward": + return ( + + + + + + + ); + case "step-backward": + return ( + + + + + + + ); + + default: + return
; + } +} diff --git a/packages/shared/pluggable-widgets-commons/src/components/web/Pagination.tsx b/packages/shared/pluggable-widgets-commons/src/components/web/Pagination.tsx index b2e4e5fa17..3f01f8d7ab 100644 --- a/packages/shared/pluggable-widgets-commons/src/components/web/Pagination.tsx +++ b/packages/shared/pluggable-widgets-commons/src/components/web/Pagination.tsx @@ -1,4 +1,5 @@ import { createElement, Dispatch, HTMLAttributes, ReactElement, SetStateAction } from "react"; +import ControlIcon from "./ControlIcon"; export interface PaginationProps { canNextPage: boolean; @@ -51,7 +52,7 @@ export function Pagination(props: PaginationProps): ReactElement | null { })} aria-label={props.labelFirstPage ?? "Go to first page"} > - + {props.labelPagingStatus ?? "Currently showing"} {pagingStatus} @@ -79,7 +80,7 @@ export function Pagination(props: PaginationProps): ReactElement | null { setPageIndex(props.page + 1); })} > - + {hasLastPage && ( )} diff --git a/packages/shared/pluggable-widgets-commons/src/components/web/__tests__/__snapshots__/Pagination.spec.tsx.snap b/packages/shared/pluggable-widgets-commons/src/components/web/__tests__/__snapshots__/Pagination.spec.tsx.snap index 61e03328ac..1f73786900 100644 --- a/packages/shared/pluggable-widgets-commons/src/components/web/__tests__/__snapshots__/Pagination.spec.tsx.snap +++ b/packages/shared/pluggable-widgets-commons/src/components/web/__tests__/__snapshots__/Pagination.spec.tsx.snap @@ -13,8 +13,23 @@ exports[`Pagination renders the current page correctly with server side paging 1 > `; @@ -63,8 +108,23 @@ exports[`Pagination renders the structure correctly 1`] = ` > `;