Skip to content

Commit

Permalink
Merge pull request #3141 from mi6/develop
Browse files Browse the repository at this point in the history
Develop -> Main
  • Loading branch information
GCHQ-Developer-299 authored Feb 5, 2025
2 parents 6933256 + f8c256d commit 2654ddc
Show file tree
Hide file tree
Showing 763 changed files with 1,280 additions and 928 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ic-ui-kit-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Run release check
run: |
RELEASE_CHECK=$((echo y; sleep 0.5; echo $'\n';) | npm run release-check)
echo "VERSION=$(echo $RELEASE_CHECK | cut -c 223-293)" >> $GITHUB_ENV
echo "VERSION=$(echo $RELEASE_CHECK | cut -c 75-342)" >> $GITHUB_ENV
git stash
- name: Create develop -> main PR
run: |
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions packages/canary-react/package-lock.json

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

Original file line number Diff line number Diff line change
Expand Up @@ -1581,11 +1581,23 @@ describe("IcDataTable with truncation", () => {

cy.checkHydrated(DATA_TABLE_SELECTOR);

cy.findShadowEl(DATA_TABLE_SELECTOR, SORT_BUTTON_SELECTOR).eq(4).click();

cy.findShadowEl(DATA_TABLE_SELECTOR, TABLE_ROW_SELECTOR)
.last()
.find(`${LAST_CELL_SELECTOR} ic-tooltip`)
.should(HAVE_LENGTH, 1);

cy.findShadowEl(DATA_TABLE_SELECTOR, SORT_BUTTON_SELECTOR)
.eq(4)
.click()
.click();
cy.findShadowEl(DATA_TABLE_SELECTOR, SORT_BUTTON_SELECTOR).eq(2).click();

cy.findShadowEl(DATA_TABLE_SELECTOR, TABLE_ROW_SELECTOR)
.last()
.find(`${LAST_CELL_SELECTOR} ic-tooltip`)
.should(HAVE_LENGTH, 1)
.should(HAVE_ATTR, "label", LONG_DATA_VALUES[2].jobTitle);

cy.compareSnapshot({
Expand Down Expand Up @@ -4324,7 +4336,7 @@ describe("IcDataTable row deletion", () => {
cy.findShadowEl(DATA_TABLE_SELECTOR, "tr").should(HAVE_LENGTH, 5);
});

it.skip("should have tooltip visible when it would overlap bottom of table", () => {
it("should have tooltip visible when it would overlap bottom of table", () => {
const clonedData = JSON.parse(JSON.stringify(DATA_REACT_ELEMENTS));
const nextData = [...clonedData];
mount(
Expand Down Expand Up @@ -4364,6 +4376,8 @@ describe("IcDataTable row deletion", () => {
.find("button")
.focus();

cy.checkA11yWithWait(undefined, 1000);

cy.compareSnapshot({
name: "tooltip-in-final-row",
testThreshold: setThresholdBasedOnEnv(DEFAULT_THRESHOLD + 0.041),
Expand Down
9 changes: 4 additions & 5 deletions packages/canary-web-components/package-lock.json

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

Original file line number Diff line number Diff line change
Expand Up @@ -1969,7 +1969,8 @@ export class DataTable {
) {
this.addLineClampCSS(typographyEl, cellContainer);
}
this.createTruncationTooltip(typographyEl, cellContainer);
if (!cellContainer.querySelector(this.IC_TOOLTIP_STRING))
this.createTruncationTooltip(typographyEl, cellContainer);
}
}
private setTableDimensions = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1502,6 +1502,7 @@ export const TruncationTooltip = (): HTMLElement => {
dataTable.globalRowHeight = 40;
dataTable.variableRowHeight = null;
dataTable.setAttribute("truncation-pattern", "tooltip");
dataTable.setAttribute("sortable", "true");

const resetButton = document.createElement("ic-button");
resetButton.addEventListener("click", () => dataTable.resetRowHeights(40));
Expand Down
60 changes: 30 additions & 30 deletions packages/docs/docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -19194,6 +19194,36 @@
"docstring": "",
"path": "src/utils/types.ts"
},
"src/components/ic-search-bar/ic-search-bar.types.ts::IcSearchBarSearchModes": {
"declaration": "export type IcSearchBarSearchModes = \"navigation\" | \"query\";",
"docstring": "",
"path": "src/components/ic-search-bar/ic-search-bar.types.ts"
},
"src/utils/types.ts::IcMenuOption": {
"declaration": "export interface IcMenuOption {\n description?: string;\n disabled?: boolean;\n recommended?: boolean;\n children?: IcMenuOption[];\n loading?: boolean;\n timedOut?: boolean;\n [key: string]: any;\n element?: {\n component: any;\n ariaLabel: string;\n };\n icon?: any;\n}",
"docstring": "",
"path": "src/utils/types.ts"
},
"src/components/ic-search-bar/ic-search-bar.types.ts::IcSearchBarBlurEventDetail": {
"declaration": "export interface IcSearchBarBlurEventDetail extends IcValueEventDetail {\n relatedTarget: IcRelatedTarget;\n}",
"docstring": "",
"path": "src/components/ic-search-bar/ic-search-bar.types.ts"
},
"src/components/ic-menu/ic-menu.types.ts::IcOptionSelectEventDetail": {
"declaration": "export interface IcOptionSelectEventDetail {\n value: string;\n label?: string;\n optionId?: string;\n}",
"docstring": "",
"path": "src/components/ic-menu/ic-menu.types.ts"
},
"src/components/ic-menu/ic-menu.types.ts::IcMenuChangeEventDetail": {
"declaration": "export interface IcMenuChangeEventDetail {\n open: boolean;\n focusInput?: boolean;\n}",
"docstring": "",
"path": "src/components/ic-menu/ic-menu.types.ts"
},
"src/utils/types.ts::IcBlurEventDetail": {
"declaration": "export interface IcBlurEventDetail {\n relatedTarget: IcRelatedTarget;\n}",
"docstring": "",
"path": "src/utils/types.ts"
},
"src/components/ic-empty-state/ic-empty-state.types.ts::IcEmptyStateAlignment": {
"declaration": "export type IcEmptyStateAlignment = \"left\" | \"center\" | \"right\";",
"docstring": "",
Expand Down Expand Up @@ -19229,31 +19259,11 @@
"docstring": "",
"path": "src/utils/types.ts"
},
"src/components/ic-search-bar/ic-search-bar.types.ts::IcSearchBarSearchModes": {
"declaration": "export type IcSearchBarSearchModes = \"navigation\" | \"query\";",
"docstring": "",
"path": "src/components/ic-search-bar/ic-search-bar.types.ts"
},
"src/utils/types.ts::IcMenuOption": {
"declaration": "export interface IcMenuOption {\n description?: string;\n disabled?: boolean;\n recommended?: boolean;\n children?: IcMenuOption[];\n loading?: boolean;\n timedOut?: boolean;\n [key: string]: any;\n element?: {\n component: any;\n ariaLabel: string;\n };\n icon?: any;\n}",
"docstring": "",
"path": "src/utils/types.ts"
},
"src/components/ic-menu/ic-menu.types.ts::IcMenuOptionIdEventDetail": {
"declaration": "export interface IcMenuOptionIdEventDetail {\n optionId: string | undefined;\n}",
"docstring": "",
"path": "src/components/ic-menu/ic-menu.types.ts"
},
"src/components/ic-menu/ic-menu.types.ts::IcOptionSelectEventDetail": {
"declaration": "export interface IcOptionSelectEventDetail {\n value: string;\n label?: string;\n optionId?: string;\n}",
"docstring": "",
"path": "src/components/ic-menu/ic-menu.types.ts"
},
"src/components/ic-menu/ic-menu.types.ts::IcMenuChangeEventDetail": {
"declaration": "export interface IcMenuChangeEventDetail {\n open: boolean;\n focusInput?: boolean;\n}",
"docstring": "",
"path": "src/components/ic-menu/ic-menu.types.ts"
},
"src/components/ic-menu-item/ic-menu-item.types.ts::IcMenuItemVariants": {
"declaration": "export type IcMenuItemVariants = \"toggle\" | \"destructive\" | \"default\";",
"docstring": "",
Expand Down Expand Up @@ -19294,16 +19304,6 @@
"docstring": "",
"path": "src/components/ic-radio-group/ic-radio-group.types.ts"
},
"src/components/ic-search-bar/ic-search-bar.types.ts::IcSearchBarBlurEventDetail": {
"declaration": "export interface IcSearchBarBlurEventDetail extends IcValueEventDetail {\n relatedTarget: IcRelatedTarget;\n}",
"docstring": "",
"path": "src/components/ic-search-bar/ic-search-bar.types.ts"
},
"src/utils/types.ts::IcBlurEventDetail": {
"declaration": "export interface IcBlurEventDetail {\n relatedTarget: IcRelatedTarget;\n}",
"docstring": "",
"path": "src/utils/types.ts"
},
"src/utils/types.ts::IcSearchMatchPositions": {
"declaration": "export type IcSearchMatchPositions = \"start\" | \"anywhere\";",
"docstring": "",
Expand Down
Loading

0 comments on commit 2654ddc

Please sign in to comment.