Skip to content

Commit

Permalink
Merge branch 'master' into Add-Alpha-style-to--StatusTag--5454353803
Browse files Browse the repository at this point in the history
  • Loading branch information
rivka-ungar authored May 22, 2024
2 parents 323bda8 + 06a9505 commit 4377592
Show file tree
Hide file tree
Showing 76 changed files with 1,393 additions and 1,000 deletions.
15 changes: 14 additions & 1 deletion packages/core/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const commonRules = {
"no-underscore-dangle": "off",
"import/prefer-default-export": "off",
"no-plusplus": "off",
"react/react-in-jsx-scope": 0,
"react/react-in-jsx-scope": "error",
"react/no-danger": "error",
"react/jsx-one-expression-per-line": "off",
"react/prop-types": 0,
Expand Down Expand Up @@ -110,6 +110,19 @@ module.exports = {
"react-hooks/rules-of-hooks": "off",
"react/jsx-key": "off"
}
},
// TODO This entire block should be removed and fixed, unless we move to React 17+
{
files: [
"**/__stories__/**/*.{js,jsx,ts,tsx}",
"src/storybook/stand-alone-documentaion/**/*.{js,jsx,ts,tsx}",
"src/storybook/patterns/**/*.{js,jsx,ts,tsx}",
"src/storybook/components/**/*.{js,jsx,ts,tsx}",
"src/storybook/decorators/**/*.{js,jsx,ts,tsx}"
],
rules: {
"react/react-in-jsx-scope": "off"
}
}
],
env: {
Expand Down
5 changes: 0 additions & 5 deletions packages/core/.storybook/preview.d.ts

This file was deleted.

7 changes: 3 additions & 4 deletions packages/core/.storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import * as VibeComponents from "../src/components/index";
import * as VibeComponents from "../src/components";
import * as VibeComponentsNext from "../src/next";
import * as VibeIcons from "../src/components/Icon/Icons/index";
import * as VibeIcons from "../src/components/Icon/Icons";
import { Preview } from "@storybook/react";
import isChromatic from "chromatic/isChromatic";
import { DocsContainer, DocsPage, Unstyled } from "@storybook/blocks";
Expand All @@ -25,7 +25,6 @@ import {
UsageGuidelines,
withMemoryStats,
RelatedComponent,
MultipleStoryElementsWrapper,
StorybookLink
} from "vibe-storybook-components";
import CanvasWrapper from "../src/storybook/components/canvas-wrapper/CanvasWrapper";
Expand Down Expand Up @@ -147,7 +146,7 @@ const preview: Preview = {
}
}
},

loaders: isChromatic() && document.fonts ? [fontLoader] : []
};

Expand Down
7 changes: 7 additions & 0 deletions packages/core/.storybook/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": "../tsconfig.base.json",
"compilerOptions": {
"resolveJsonModule": true
},
"include": ["**/*.ts", "**/*.tsx", "**/*.json"]
}
44 changes: 44 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,50 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.109.0](https://github.com/mondaycom/vibe/compare/[email protected]@2.109.0) (2024-05-21)


### Bug Fixes

* **Dropdown:** migrate to TS continue ([#2109](https://github.com/mondaycom/vibe/issues/2109)) ([a7a51ad](https://github.com/mondaycom/vibe/commit/a7a51ada6400b045c831978e3d5d419c35e0a8b1))
* **TextArea:** add background color and text for dark mode ([#2130](https://github.com/mondaycom/vibe/issues/2130)) ([8d6a84c](https://github.com/mondaycom/vibe/commit/8d6a84ce884b3f3b37309015583bae9533304fc8))


### Features

* **label:** add small variant ([#2121](https://github.com/mondaycom/vibe/issues/2121)) ([2ca6562](https://github.com/mondaycom/vibe/commit/2ca65624abb07c88fde5e758a47c7e6c4e62b60f))
* **withLiveEdit:** add actions for copy, format, and reset at the bottom of the live editor ([#2123](https://github.com/mondaycom/vibe/issues/2123)) ([f384d7c](https://github.com/mondaycom/vibe/commit/f384d7c95fe4e9bf65a5c590b1fbb0082c869eee))





## [2.108.3](https://github.com/mondaycom/vibe/compare/[email protected]@2.108.3) (2024-05-16)


### Bug Fixes

* **Dialog.tsx:** getContainer causing react error 200 ([#2124](https://github.com/mondaycom/vibe/issues/2124)) ([b018467](https://github.com/mondaycom/vibe/commit/b018467b43f648372f8cee3d2b7eb4c2c875287b))





## [2.108.2](https://github.com/mondaycom/vibe/compare/[email protected]@2.108.2) (2024-05-16)


### Bug Fixes

* **AlertBanner:** replace Button & Icon with IconButton ([#2120](https://github.com/mondaycom/vibe/issues/2120)) ([ee2d11c](https://github.com/mondaycom/vibe/commit/ee2d11cbb64d94a837e3b902e9eb1d1724c69cde))
* **Storybook Docs:** typo ([#2119](https://github.com/mondaycom/vibe/issues/2119)) ([25ff8fb](https://github.com/mondaycom/vibe/commit/25ff8fbbea1d221c45dc69102b5d965b888d09da))
* **TabsContext:** use onTabChange from child props ([#2125](https://github.com/mondaycom/vibe/issues/2125)) ([11bbddf](https://github.com/mondaycom/vibe/commit/11bbddf748a80bbebd246f5e8d3dd2bd96bd09ab))
* **Typography:** change tooltipProps type to Partial< TooltipProps > ([#2118](https://github.com/mondaycom/vibe/issues/2118)) ([707c5c3](https://github.com/mondaycom/vibe/commit/707c5c31372c1cbb9e3bd8e8fcfefea91ab0088f))
* **Typography:** make anchor style apply only to direct child ([#2115](https://github.com/mondaycom/vibe/issues/2115)) ([337975b](https://github.com/mondaycom/vibe/commit/337975b97de2120ed52b70a99ceaddb208015bbe))





## [2.108.1](https://github.com/mondaycom/vibe/compare/[email protected]@2.108.1) (2024-05-09)


Expand Down
7 changes: 4 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monday-ui-react-core",
"version": "2.108.1",
"version": "2.109.0",
"description": "Official monday.com UI resources for application development in React.js",
"main": "./dist/main.js",
"types": "./dist/types.d.ts",
Expand Down Expand Up @@ -180,14 +180,15 @@
"@types/react-dates": "^21.8.3",
"@types/react-is": "^16.7.5",
"@types/react-resizable": "^3.0.7",
"@types/react-select": "^3.1.2",
"@types/react-test-renderer": "^16.9.0",
"@types/react-transition-group": "^4.4.5",
"@types/react-virtualized-auto-sizer": "^1.0.1",
"@types/react-window": "^1.8.5",
"@typescript-eslint/eslint-plugin": "^5.36.1",
"@typescript-eslint/parser": "^5.36.1",
"@uiw/codemirror-extensions-langs": "^4.21.25",
"@uiw/codemirror-theme-vscode": "^4.21.25",
"@uiw/codemirror-theme-github": "^4.21.25",
"@uiw/react-codemirror": "^4.21.25",
"acorn": "^8.7.1",
"autoprefixer": "^10.4.0",
Expand Down Expand Up @@ -251,7 +252,7 @@
"sass-loader": "^12.4.0",
"snapshot-diff": "^0.9.0",
"storybook": "^7.5.3",
"storybook-addon-playground": "^1.8.0",
"storybook-addon-playground": "^1.9.0",
"style-loader": "^3.3.1",
"stylelint": "^14.2.0",
"stylelint-config-recommended": "^7.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/plop/component/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ module.exports = plop => {
},
{
type: "append",
path: "src/components/index.js",
path: "src/components/index.ts",
pattern: /(\n$)/gm,
separator: "",
template:
Expand Down
3 changes: 1 addition & 2 deletions packages/core/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,8 @@ export default {
extensions: [...EXTENSIONS, ".json", ".css"]
}),
typescript({
tsconfig: path.join(ROOT_PATH, "tsconfig.esm.json"),
tsconfigOverride: {
exclude: ["**/__tests__", "**/__stories__"]
exclude: ["**/__tests__", "**/__stories__", path.join(SRC_PATH, "storybook")]
}
}),
babel({
Expand Down
2 changes: 1 addition & 1 deletion packages/core/scripts/build-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function buildComponentsTypesIndexFile() {
function buildStorybookComponentsIndexFile() {
const imports = ["import 'vibe-storybook-components/index.css';"];
const exports = ["export * from 'vibe-storybook-components'"];
convertExportsToFile(imports.concat(exports), "storybook/index.js");
convertExportsToFile(imports.concat(exports), "storybook/index.ts");
}

module.exports = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from "react";
import { fireEvent, render, screen } from "@testing-library/react";
import Accordion from "../../Accordion/Accordion";
import AccordionItem from "../AccordionItem";
Expand Down
12 changes: 6 additions & 6 deletions packages/core/src/components/AlertBanner/AlertBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { getStyle } from "../../helpers/typesciptCssModulesHelper";
import cx from "classnames";
import React, { ForwardedRef, forwardRef, ReactElement, useMemo } from "react";
import Button from "../../components/Button/Button";
import Icon from "../../components/Icon/Icon";
import IconButton from "../../components/IconButton/IconButton";
import CloseSmall from "../../components/Icon/Icons/components/CloseSmall";
import { AlertBannerBackgroundColor } from "./AlertBannerConstants";
import { NOOP } from "../../utils/function-utils";
Expand Down Expand Up @@ -126,17 +126,17 @@ const AlertBanner: VibeComponent<AlertBannerProps> & {
</AlertBannerContext.Provider>
<div className={cx(styles.closeButtonWrapper)}>
{isCloseHidden ? null : (
<Button
<IconButton
data-testid="alert-banner-close-button"
icon={CloseSmall}
className={cx(styles.closeBtn)}
hideTooltip
onClick={onClose}
size={Button.sizes.SMALL}
kind={Button.kinds.TERTIARY}
kind={IconButton.kinds.TERTIARY}
color={isDarkBackground ? Button.colors.ON_INVERTED_BACKGROUND : Button.colors.ON_PRIMARY_COLOR}
ariaLabel={closeButtonAriaLabel}
>
<Icon iconType={Icon.type.SVG} clickable={false} icon={CloseSmall} iconSize="20px" ignoreFocusStyle />
</Button>
/>
)}
</div>
</Text>
Expand Down
Loading

0 comments on commit 4377592

Please sign in to comment.