Merged in fix/lint-issues (pull request #1678)
Fix lint issues in design-system and scandic-web * Remove unused color prop from LogoAndIllustrationProps to fix lint issues * Fix lint issues in web * Fix logos type Approved-by: Joakim Jäderberg
This commit is contained in:
@@ -2,12 +2,7 @@ import { iconVariants } from '../../variants'
|
||||
|
||||
import type { IconProps } from '../../icon'
|
||||
|
||||
export default function CoolingIcon({
|
||||
className,
|
||||
color,
|
||||
size,
|
||||
...props
|
||||
}: IconProps) {
|
||||
export default function CoolingIcon({ className, color, ...props }: IconProps) {
|
||||
const classNames = iconVariants({ className, color })
|
||||
return (
|
||||
<svg
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedIcon({ color, ...props }: LogoAndIllustrationProps) {
|
||||
export default function BedIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedBunkIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function BedBunkIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedBunkExtraIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function BedBunkExtraIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedGenericIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function BedGenericIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedKingIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function BedKingIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedPullOutIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function BedPullOutIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedPullOutExtraIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function BedPullOutExtraIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedQueenIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function BedQueenIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedSingleIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function BedSingleIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedSofaIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function BedSofaIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedSofaExtraIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function BedSofaExtraIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedTwinIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function BedTwinIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function BedWallExtraIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function BedWallExtraIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function CoinIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function CoinIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function CroissantCoffeeEggIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function CroissantCoffeeEggIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function CutleryOneIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function CutleryOneIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function CutleryTwoIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function CutleryTwoIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function GiftOpenIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function GiftOpenIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function HandKeyIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function HandKeyIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function HotelNightIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function HotelNightIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function KidsIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function KidsIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function KidsMocktailIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function KidsMocktailIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function MagicWandIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function MagicWandIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function MoneyHandIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function MoneyHandIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function SurpriseIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function SurpriseIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { IllustrationProps } from '../icon'
|
||||
|
||||
export default function VoucherIcon({
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
export default function VoucherIcon(props: IllustrationProps) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { LogoProps } from '../icon'
|
||||
import { iconVariants } from '../variants'
|
||||
|
||||
export default function DowntownCamperIcon({
|
||||
className,
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
}: LogoProps) {
|
||||
const classNames = iconVariants({ className, color })
|
||||
return (
|
||||
<svg
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { iconVariants } from '../variants'
|
||||
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { LogoProps } from '../icon'
|
||||
|
||||
export default function GrandHotelOsloLogoIcon({
|
||||
className,
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
}: LogoProps) {
|
||||
const classNames = iconVariants({ className, color })
|
||||
return (
|
||||
<svg
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { iconVariants } from '../variants'
|
||||
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { LogoProps } from '../icon'
|
||||
|
||||
export default function HaymarketIcon({
|
||||
className,
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
}: LogoProps) {
|
||||
const classNames = iconVariants({ className, color })
|
||||
return (
|
||||
<svg
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { iconVariants } from '../variants'
|
||||
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { LogoProps } from '../icon'
|
||||
|
||||
export default function HotelNorgeIcon({
|
||||
className,
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
}: LogoProps) {
|
||||
const classNames = iconVariants({ className, color })
|
||||
return (
|
||||
<svg
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { iconVariants } from '../variants'
|
||||
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { LogoProps } from '../icon'
|
||||
|
||||
export default function MarskiLogoIcon({
|
||||
className,
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
}: LogoProps) {
|
||||
const classNames = iconVariants({ className, color })
|
||||
return (
|
||||
<svg
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { iconVariants } from '../variants'
|
||||
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { LogoProps } from '../icon'
|
||||
|
||||
export default function ScandicGoLogoIcon({
|
||||
className,
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
}: LogoProps) {
|
||||
const classNames = iconVariants({ className, color })
|
||||
return (
|
||||
<svg
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { iconVariants } from '../variants'
|
||||
|
||||
import type { LogoAndIllustrationProps } from '../icon'
|
||||
import type { LogoProps } from '../icon'
|
||||
|
||||
export default function ScandicLogoIcon({
|
||||
className,
|
||||
color,
|
||||
...props
|
||||
}: LogoAndIllustrationProps) {
|
||||
}: LogoProps) {
|
||||
const classNames = iconVariants({ className, color })
|
||||
return (
|
||||
<svg
|
||||
|
||||
@@ -7,7 +7,14 @@ export interface IconProps
|
||||
size?: number
|
||||
}
|
||||
|
||||
export interface LogoAndIllustrationProps
|
||||
export interface IllustrationProps
|
||||
extends Omit<React.SVGAttributes<HTMLOrSVGElement>, 'color'>,
|
||||
Omit<VariantProps<typeof iconVariants>, 'color'> {
|
||||
width?: string | number
|
||||
height?: string | number
|
||||
}
|
||||
|
||||
export interface LogoProps
|
||||
extends Omit<React.SVGAttributes<HTMLOrSVGElement>, 'color'>,
|
||||
VariantProps<typeof iconVariants> {
|
||||
width?: string | number
|
||||
|
||||
@@ -74,7 +74,7 @@ export { default as Popcorn2Icon } from './Nucleo/Food/popcorn-2'
|
||||
|
||||
export type {
|
||||
IconProps,
|
||||
LogoAndIllustrationProps,
|
||||
IllustrationProps as LogoAndIllustrationProps,
|
||||
NucleoIconProps,
|
||||
} from './icon'
|
||||
export type {
|
||||
|
||||
Reference in New Issue
Block a user