Skip to content

Commit

Permalink
Merge branch 'master' into vibe3
Browse files Browse the repository at this point in the history
  • Loading branch information
talkor committed Aug 12, 2024
2 parents 33ad206 + 5e7321c commit 46114b3
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 2 deletions.
23 changes: 23 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,29 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.130.2](https://github.com/mondaycom/vibe/compare/[email protected]@2.130.2) (2024-08-12)


### Bug Fixes

* **AvatarGroup:** avatar in tipseen without image is wrong size ([#2353](https://github.com/mondaycom/vibe/issues/2353)) ([3d0cfe6](https://github.com/mondaycom/vibe/commit/3d0cfe6e0988a01b5a34939072c3e21c6c06c076))





## [2.130.1](https://github.com/mondaycom/vibe/compare/[email protected]@2.130.1) (2024-08-12)


### Bug Fixes

* **menuButton:** fix scale for disabled menu button ([#2319](https://github.com/mondaycom/vibe/issues/2319)) ([c84a9ae](https://github.com/mondaycom/vibe/commit/c84a9ae4e80eed2e3a6e01d7882ef701dd70be47))
* targets for storybook ([#2351](https://github.com/mondaycom/vibe/issues/2351)) ([e9d2a5c](https://github.com/mondaycom/vibe/commit/e9d2a5ca21d7574991ee5690c00b04b955aaa2f8))





# [2.130.0](https://github.com/mondaycom/vibe/compare/[email protected]@2.130.0) (2024-08-08)


Expand Down
15 changes: 14 additions & 1 deletion packages/core/babel.config.cjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const TESTING_STORYBOOK = process.env.testing === "storybook";

module.exports = api => {
const env = process.env.NODE_ENV;
api.cache.using(() => env);
Expand Down Expand Up @@ -35,7 +37,18 @@ module.exports = api => {
[
"@babel/preset-env",
{
modules: env === "test" ? "commonjs" : false
modules: env === "test" ? "commonjs" : false,
targets: TESTING_STORYBOOK
? {
node: "current"
}
: {
chrome: "66",
ie: "11",
firefox: "51",
edge: "18",
node: "current"
}
}
],
"@babel/preset-typescript",
Expand Down
13 changes: 13 additions & 0 deletions packages/core/jest.init.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,19 @@ Object.defineProperty(window, "matchMedia", {
});

ReactDOM.createPortal = node => node;
const { testing } = process.env;
const TESTING_STORYBOOK = testing === "storybook";

if (TESTING_STORYBOOK) {
jest.mock("react-transition-group", () => {
const FakeTransition = jest.fn(({ children }) => children);
const FakeCSSTransition = jest.fn(props => (props.in ? <FakeTransition>{props.children}</FakeTransition> : null));
return { CSSTransition: FakeCSSTransition, Transition: FakeTransition, SwitchTransition: FakeTransition };
});
jest.mock("consolidated-events", () => {
return { addEventListener: jest.fn() };
});
}

const error = console.error;
console.error = function (warning) {
Expand Down
2 changes: 1 addition & 1 deletion 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.130.0",
"version": "2.130.2",
"description": "Official monday.com UI resources for application development in React.js",
"type": "module",
"types": "./dist/index.d.ts",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ export const avatarRenderer = (
customSize={AVATAR_GROUP_COUNTER_AVATAR_SIZE}
type={type || avatarProps?.type}
tabIndex={-1}
size={Avatar.sizes.SMALL}
/>
{!displayAsGrid && (
<div id={labelId} className={avatarGroupCounterTooltipContentStyles.tooltipAvatarItemTitle}>
Expand Down
4 changes: 4 additions & 0 deletions packages/core/src/components/Modal/Modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ export interface ModalProps {
* z-index attribute of the container
*/
zIndex?: number;
/**
* If true, the modal will unmount when it's not shown
*/
unmountOnClose?: boolean;
}

const Modal: FC<ModalProps> & { width?: typeof ModalWidthEnum } = ({
Expand Down

0 comments on commit 46114b3

Please sign in to comment.