Skip to content

Commit

Permalink
Merge pull request #674 from icflorescu/next
Browse files Browse the repository at this point in the history
Revert to fix regression
  • Loading branch information
icflorescu authored Nov 26, 2024
2 parents 9f0eafc + 4fe3754 commit a31cccf
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 9 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
The following is a list of notable changes to the Mantine DataTable component.
Minor versions that are not listed in the changelog are bug fixes and small improvements.

## 7.14.4 (2024-10-26)

- Revert previous commit to fix regression (https://github.com/icflorescu/mantine-datatable/issues/663#issuecomment-2501215033)

## 7.14.3 (2024-10-26)

- Fix [#663](https://github.com/icflorescu/mantine-datatable/issues/663) - buttons not clickable inside emptyState
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The [lightweight](https://bundlephobia.com/package/mantine-datatable), dependenc

> _Thank you for the wonderful, useful, and beautiful DataTable that has allowed me to create several applications without any problem 👏_
Mantine DataTable is used by developers and companies around the world, such as: [SegmentX](https://segmentx.ai), [Namecheap](https://www.namecheap.com/), [EasyWP](https://www.easywp.com/), [Aquarino](https://www.aquarino.com.br/), [Dera](https://getdera.com/), [kapa.ai](https://kapa.ai/), [exdatis.ai](https://exdatis.ai/), [teachfloor](https://www.teachfloor.com/), [MARKUP](https://www.getmarkup.com/), [BookieBase](https://bookiebase.ie/), [zipline](https://zipline.diced.tech/), [Pachtop](https://github.com/pacholoamit/pachtop), [Ganymede](https://github.com/Zibbp/ganymede), [COH3 Stats](https://coh3stats.com/), [Culver City Rental Registry](https://www.ccrentals.org/) and many more.
Mantine DataTable is used by developers and companies around the world, such as: [Namecheap](https://www.namecheap.com/), [EasyWP](https://www.easywp.com/), [CodeParrot.AI](https://codeparrot.ai), [OmicsStudio](https://omicsstudio.com), [SegmentX](https://segmentx.ai), [Aquarino](https://www.aquarino.com.br/), [Dera](https://getdera.com/), [kapa.ai](https://kapa.ai/), [exdatis.ai](https://exdatis.ai/), [teachfloor](https://www.teachfloor.com/), [MARKUP](https://www.getmarkup.com/), [BookieBase](https://bookiebase.ie/), [zipline](https://zipline.diced.tech/), [Pachtop](https://github.com/pacholoamit/pachtop), [Ganymede](https://github.com/Zibbp/ganymede), [COH3 Stats](https://coh3stats.com/), [Culver City Rental Registry](https://www.ccrentals.org/) and many more.

If you're using Mantine DataTable in your project, please drop me a line at the email address listed in my [GitHub profile](https://github.com/icflorescu) and I'll be happy to add it to the list and on the [documentation website](https://icflorescu.github.io/mantine-datatable/).

Expand All @@ -56,7 +56,7 @@ Visit [icflorescu.github.io/mantine-datatable](https://icflorescu.github.io/mant

## Mantine DataTable AI Bot

[Mantine DataTable AI Bot](https://codeparrot.ai/oracle?owner=icflorescu&repo=mantine-datatable), kindly provided by [CodeParrot](https://codeparrot.ai), will help you understand this repository better. You can ask for code examples, installation guide, debugging help and much more.
[Mantine DataTable AI Bot](https://codeparrot.ai/oracle?owner=icflorescu&repo=mantine-datatable), kindly provided by [CodeParrot.AI](https://codeparrot.ai), will help you understand this repository better. You can ask for code examples, installation guide, debugging help and much more.

## Quickstart

Expand Down
4 changes: 2 additions & 2 deletions components/AppWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import classes from './AppWrapper.module.css';
import { Footer } from './Footer';
import { Header } from './Header';
import { Navbar } from './Navbar';
import { PackageUsers } from './PackageUsers';
import { TrustedBy } from './TrustedBy';

export function AppWrapper({ children }: React.PropsWithChildren) {
const [navbarExpanded, { toggle: toggleNavbar, close: collapseNavbar }] = useDisclosure(false);
Expand All @@ -28,7 +28,7 @@ export function AppWrapper({ children }: React.PropsWithChildren) {
<AppShellMain className={classes.main}>
<div className={classes.content}>
<Container>{children}</Container>
<PackageUsers />
<TrustedBy />
</div>
</AppShellMain>
<Footer ref={ref} />
Expand Down
File renamed without changes.
13 changes: 9 additions & 4 deletions components/PackageUsers.tsx → components/TrustedBy.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* eslint-disable jsx-a11y/alt-text */
import { Container, Text } from '@mantine/core';
import { PRODUCT_NAME, WEBSITE_LINK } from '~/app/config';
import classes from './PackageUsers.module.css';
import classes from './TrustedBy.module.css';

const USERS: {
const ITEMS: {
name: string;
showText?: boolean;
logo: { base: string; ext: 'png' | 'webp' | 'svg'; themed?: true; scale?: number; shift?: number };
Expand All @@ -27,6 +27,11 @@ const USERS: {
link: 'https://codeparrot.ai',
shift: 1,
},
{
name: 'OmicsStudio',
logo: { base: 'omicsstudio', ext: 'svg', themed: true },
link: 'https://omicsstudio.com',
},
{
name: 'SegmentX',
showText: true,
Expand Down Expand Up @@ -113,12 +118,12 @@ const USERS: {

const ROOT_URL = `${process.env.GITHUB_PAGES === 'TRUE' ? WEBSITE_LINK : ''}/users/`;

export function PackageUsers() {
export function TrustedBy() {
return (
<div className={classes.root}>
<h2 className={classes.title}>{PRODUCT_NAME} is trusted by</h2>
<Container className={classes.links}>
{USERS.map(({ name, logo: { base, ext, themed, scale, shift: imageShift }, link, showText, shift }) => {
{ITEMS.map(({ name, logo: { base, ext, themed, scale, shift: imageShift }, link, showText, shift }) => {
const title = `${name} is using ${PRODUCT_NAME}`;
const commonImageAttrs: React.ImgHTMLAttributes<HTMLImageElement> = {
style: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mantine-datatable",
"version": "7.14.3",
"version": "7.14.4",
"description": "The lightweight, dependency-free, dark-theme aware table component for your Mantine UI data-rich applications, featuring asynchronous data loading support, pagination, intuitive Gmail-style additive batch rows selection, column sorting, custom cell data rendering, row expansion, nesting, context menus, and much more",
"keywords": [
"mantine",
Expand Down
1 change: 1 addition & 0 deletions package/DataTableEmptyState.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
bottom: 0;
left: 0;
flex-direction: column;
pointer-events: none;
color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-3));
opacity: 0;
transition: opacity 0.2s;
Expand Down
1 change: 1 addition & 0 deletions public/users/omicsstudio-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a31cccf

Please sign in to comment.