Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix "loading" being passed as html props to div error #1944

Merged
merged 1 commit into from
May 20, 2021
+5 −3
Merged

fix "loading" being passed as html props to div error #1944

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix "loading" being passed as html props to div error
@justincorrigible
justincorrigible committed May 20, 2021
commit 75bf19ee5f728f6b92da7cd298c5817746637640
6 changes: 4 additions & 2 deletions uikit/Container/index.tsx
View file
Original file line number Diff line number Diff line change
@@ -19,11 +19,13 @@

import * as React from 'react';
import color from 'color';
import { css, styled } from '..';
import { css, isPropValid, styled } from '..';
import useTheme from '../utils/useTheme';
import DnaLoader from '../DnaLoader';

const ContainerBackground = styled<'div', { loading?: boolean }>('div')`
const ContainerBackground = styled<'div', { loading?: boolean }>('div', {
shouldForwardProp: (prop) => isPropValid(prop) && prop !== 'loading',
})`
border-radius: 8px;
position: relative;
overflow: ${(props) => (props.loading ? 'hidden' : 'visible')};
2 changes: 1 addition & 1 deletion uikit/index.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/*
* Copyright (c) 2020 The Ontario Institute for Cancer Research. All rights reserved
*
@@ -24,3 +23,4 @@ export type UikitTheme = typeof defaultTheme;
export { default as ThemeProvider } from './ThemeProvider';
export { default as styled } from '@emotion/styled';
export { default as css } from '@emotion/css';
export { default as isPropValid } from '@emotion/is-prop-valid';