v0.8.4

Signed-off-by: Florian BOUILLON <florian.bouillon@delta-wings.net>

.storybook/main.js

@@ -1,4 +1,5 @@
 const path = require("path");
+const webpack = require('webpack')
 
 module.exports = {
 	"stories": [
@@ -16,5 +17,18 @@ module.exports = {
 			propFilter: (prop) => (prop.parent ? !/node_modules/.test(prop.parent.fileName) : true),
 		},
 	},
-	presets: [path.resolve(__dirname, "./next.js")]
+	presets: [path.resolve(__dirname, "./next.js")],
+	// Allow to use Next/Image
+	webpackFinal: (config) => {
+		config.plugins.push(new webpack.DefinePlugin({
+			'process.env.__NEXT_IMAGE_OPTS': JSON.stringify({
+				deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
+				imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
+				domains: [],
+				path: '/',
+				loader: 'default',
+			})
+		}))
+		return config
+	}
 }

.storybook/mockNextImage.js

@@ -0,0 +1,17 @@
+// https://stackoverflow.com/a/64765638/7335674
+
+import * as nextImage from 'next/image'
+
+Object.defineProperty(nextImage, 'default', {
+	configurable: true,
+	value: (props) => {
+		return (
+			<div style={{display: 'inline-block', maxWidth: '100%', overflow: 'hidden', position: 'relative', boxSizing: 'border-box', margin: 0}}>
+				<div style={{boxSizing: 'border-box', display: 'block', maxWidth: '100%'}}>
+					<img {...props} alt="" aria-hidden="true" role="presentation" style={{maxWidth: '100%', display: 'block', margin: 0, border: 'none', padding: 0}} />
+				</div>
+				<img {...props} style={{position: 'absolute', inset: 0, boxSizing: 'border-box', padding: 0, border: 'none', margin: 'auto', display: 'block', width: 0, height: 0, minWidth: '100%', maxWidth: '100%', minHeight: '100%', maxHeight: '100%'}} />
+			</div>
+		)
+	},
+})

.storybook/preview.js

@@ -1,5 +1,6 @@
 import '../src/dzeio/general.styl'
 import './mockNextRouter'
+import './mockNextImage'
 
 export const parameters = {
   layout: 'centered'

.storybook/public/90-38.svg

@@ -0,0 +1,3 @@
+<svg width="90" height="38" viewBox="0 0 90 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<rect width="90" height="38" fill="#C4C4C4"/>
+</svg>

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dzeio/components",
-	"version": "0.7.4",
+	"version": "0.8.4",
 	"license": "MIT",
 	"main": "./index.js",
 	"types": "./types/index.d.ts",
@@ -36,7 +36,7 @@
 		"typescript": "^4.2.3"
 	},
 	"scripts": {
-		"dev": "rm -rf src/dzeio/**/*.js && start-storybook -p 6006",
+		"dev": "start-storybook -s ./.storybook/public -p 6006",
 		"build": "rollup --config",
 		"prepublishOnly": "yarn build",
 		"postinstall": "rollup --config"

rollup.config.js

@@ -13,7 +13,7 @@ export default [
 				autoModules: true,
 				mode: 'extract',
 				modules: {
-					generateScopedName: '[hash:8]'
+					generateScopedName: '[local][hash:5]'
 				}
 			}),
 			typescript({useTsconfigDeclarationDir: true}), // so Rollup can convert TypeScript to JavaScript

src/dzeio/Box/index.tsx

@@ -37,9 +37,11 @@ export default class Box extends React.Component<Props> {
 					{this.props.headerButtons}
 				</BoxHeader>
 			)}
+			{this.props.children && (
 				<BoxBody noPadding={this.props.noPadding}>
 					{this.props.children}
 				</BoxBody>
+			)}
 		</BoxWrapper>
 	)
 }

src/dzeio/Button/Button.module.styl

@@ -172,3 +172,6 @@ btn($color, $theme)
 
 	100%
 		transform rotate(365deg)
+
+.img
+	min-width 16px

src/dzeio/Button/index.tsx

@@ -33,7 +33,7 @@ export default class Button extends React.Component<Props> {
 			inner = (
 				<>
 					{typeof Icon === 'string' ? (
-						<Image src={Icon} width={16} height={16} />
+						<Image className={css.img} src={Icon} width={16} height={16} />
 					) : (
 						<Icon size={16} />
 					)}

src/dzeio/Checkbox/Checkbox.module.styl

@@ -5,28 +5,33 @@ $backColor = #757575
 .label
 	position relative
 	display flex
-	padding-left 8px
-	margin 8px
 	user-select none
+	align-items center
+
+	+ .label
+		margin-top 8px
 
 	p
-		margin-left 18px
+		margin-left 8px
 
 	span
 		top 0
 		left 0
 		width 20px
 		height @width
-		position absolute
+		position relative
-		box-shadow inset 0 0 0 2px $backColor
+		box-shadow inset 0 0 0 2px $grayDark
 		border-radius 2px
 		transition all $transition
 
+		@media (prefers-color-scheme dark)
+			box-shadow inset 0 0 0 2px $grayLight
+
 		&::after
 			border-radius 20px
 			position absolute
 			transition all $transition
-			background $default
+			background $main
 
 	svg
 		transition $transition
@@ -41,19 +46,9 @@ $backColor = #757575
 		left 0
 		opacity 0
 
-		&:focus + span
-			box-shadow inset 0 0 0 2px black, 0 0 0 2px rgba(black,.3)
-			@media (prefers-color-scheme dark)
-				box-shadow inset 0 0 0 2px white, 0 0 0 2px rgba(white,.3)
-
-		&:focus:checked + span
-			box-shadow inset 0 0 0 2px $default, 0 0 0 2px rgba($default,.3)
-			@media (prefers-color-scheme dark)
-				box-shadow inset 0 0 0 2px $default, 0 0 0 2px rgba($default,.3)
-
 		&:checked + span
-			background rgba($default, .5)
+			background rgba($main, .5)
-			box-shadow inset 0 0 0 2px $default
+			box-shadow inset 0 0 0 2px $main
 
 			svg
 				color white
@@ -67,7 +62,6 @@ $backColor = #757575
 				box-shadow inset 0 0 0 2px white
 
 .radio
-	margin-left 18px // Margin + margin for Circle
 	span
 		border-radius 20px
 
@@ -86,20 +80,19 @@ $backColor = #757575
 .switch
 	padding 2px 0 2px 10px // 2px base padding 10px circle padding
 
-	&:hover span
+	&:hover span::after
-		box-shadow none
-
-		&::after
 			background black
+			@media (prefers-color-scheme dark)
+				background white
 
 	span
 		width 28px
 		height 14px
 		border-radius 20px
 		top 50%
+		margin-right 10px
 		box-shadow none
 		background rgba($backColor, .5)
-		transform translateY(-50%)
 
 		&::after
 			content " "
@@ -115,93 +108,39 @@ $backColor = #757575
 		width 20px
 
 		&:checked + span
-			box-shadow none
-
 			&::after
 				left 100%
 				transform translate(-50%, -50%)
-				background $default
+				background $main
-
-.primary
-	$color = $primary
 
+checkBox($color)
 	input:checked + span
 		background rgba($color, .5)
 		box-shadow inset 0 0 0 2px $color
 
 		&::after
 			background $color
-
+	input:focus:checked + span
+		box-shadow inset 0 0 0 2px $color, 0 0 0 2px rgba($color,.3)
 	&.switch
 		input:checked + span
 			box-shadow none
-
-.secondary
-	$color = $secondary
-
-	input:checked + span
-		background rgba($color, .5)
-		box-shadow inset 0 0 0 2px $color
-
-		&::after
-			background $color
-
-	&.switch
-		input:checked + span
-			box-shadow none
-
 .info
-	$color = $info
+	checkBox($infoLight)
-
+	@media (prefers-color-scheme dark)
-	input:checked + span
+		checkBox($infoDark)
-		background rgba($color, .5)
-		box-shadow inset 0 0 0 2px $color
-
-		&::after
-			background $color
-
-	&.switch
-		input:checked + span
-			box-shadow none
 
 .success
-	$color = $success
+	checkBox($successLight)
+	@media (prefers-color-scheme dark)
+		checkBox($successDark)
 
-	input:checked + span
+.error
-		background rgba($color, .5)
+	checkBox($errorLight)
-		box-shadow inset 0 0 0 2px $color
+	@media (prefers-color-scheme dark)
-
+		checkBox($errorDark)
-		&::after
-			background $color
-
-	&.switch
-		input:checked + span
-			box-shadow none
-
-.danger
-	$color = $danger
-
-	input:checked + span
-		background rgba($color, .5)
-		box-shadow inset 0 0 0 2px $color
-
-		&::after
-			background $color
-
-	&.switch
-		input:checked + span
-			box-shadow none
 
 .warning
-	$color = $warning
+	checkBox($warningLight)
-
+	@media (prefers-color-scheme dark)
-	input:checked + span
+		checkBox($warningDark)
-		background rgba($color, .5)
-		box-shadow inset 0 0 0 2px $color
-
-		&::after
-			background $color
-
-	&.switch
-		input:checked + span
-			box-shadow none

src/dzeio/Checkbox/index.tsx

@@ -7,38 +7,32 @@ import css from './Checkbox.module.styl'
 import Text from '../Text'
 
 interface Props extends React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement> {
-	label?: string
+	label: string
-	id: string
+	type?: 'checkbox' | 'radio' | 'switch'
-	type?: undefined
-	radio?: boolean
-	switch?: boolean
-	color?: ColorType
 }
 
 export default class Checkbox extends React.Component<Props> {
 
 	public render() {
-		const props: Props = Object.assign({}, this.props)
+		const props: Partial<Props> = Object.assign({}, this.props)
 		delete props.label
 		delete props.type
-		delete props.color
-		delete props.switch
-		delete props.radio
 
-		const realType = this.props.radio ? 'radio' : 'checkbox'
+		const realType = this.props.type ?? 'checkbox'
 
 		return (
-			<label htmlFor={this.props.id} className={buildClassName(
+			<label htmlFor={this.props.id ?? this.props.label} className={buildClassName(
 				[css.label],
 				[css.radio, realType === 'radio'],
-				[css.switch, this.props.switch],
+				[css.switch, realType === 'switch'],
 				[css[this.props.color as string], this.props.color]
 			)}>
 				<input {...props}
-					type={realType}
+					id={this.props.id ?? this.props.label}
+					type={realType === 'switch' ? 'checkbox' : realType}
 				/>
 				<span>
-					{realType === 'checkbox' && ! this.props.switch && (
+					{realType === 'checkbox' && (
 						<Check strokeWidth={4} size={16}/>
 					)}
 				</span>

src/dzeio/GradientBackground/GradientBackground.module.styl

@@ -1,6 +1,6 @@
 @import "../config"
 
-$transparent = 15%
+$percent = 15%
 
 .back
 	transition all $transition
@@ -10,21 +10,22 @@ $transparent = 15%
 		min-height 100vh
 
 .info
-	$color = $info
+	background linear-gradient(to right, $infoLight, lighten($infoLight, $percent))
-	background linear-gradient(to left, $color, lighten($color, $transparent))
+	@media (prefers-color-scheme dark)
+		background linear-gradient(to right, $infoDark, darken($infoDark, $percent))
+		
 
 .success
-	$color = $success
+	background linear-gradient(to right, $successLight, lighten($successLight, $percent))
-	background linear-gradient(to left, $color, lighten($color, $transparent))
+	@media (prefers-color-scheme dark)
+		background linear-gradient(to right, $successDark, darken($successDark, $percent))
 
-.danger
+.error
-	$color = $danger
+	background linear-gradient(to right, $errorLight, lighten($errorLight, $percent))
-	background linear-gradient(to left, $color, lighten($color, $transparent))
+	@media (prefers-color-scheme dark)
+		background linear-gradient(to right, $errorDark, darken($errorDark, $percent))
 
 .warning
-	$color = $warning
+	background linear-gradient(to right, $warningLight, lighten($warningLight, $percent))
-	background linear-gradient(to left, $color, lighten($color, $transparent))
-
 	@media (prefers-color-scheme dark)
-	.back
+		background linear-gradient(to right, $warningDark, darken($warningDark, $percent))
-		background $darkBackground

src/dzeio/GradientBackground/index.tsx

@@ -14,12 +14,12 @@ interface Props {
 /**
  * Make the background a linear-gradient
  * 
- * @version 1.0.0
+ * @version 1.0.1
  */
 export default class GradientBackground extends React.Component<Props> {
 
 	public render = () => (
-		<div className={buildClassName(css.back, [css[this.props.color as string], this.props.color], this.props.className)}>
+		<div className={buildClassName(css.back, [css[this.props.color as string], this.props.color], this.props.className, [css.fullscreen, this.props.fullscreen])}>
 			{this.props.children}
 		</div>
 	)

src/dzeio/Input/Input.module.styl

@@ -6,7 +6,7 @@
 	max-width 100%
 	display inline-block
 
-	+ .parent
+	&:not(.block) + .parent:not(.block)
 		margin-left 16px
 
 	label
@@ -217,7 +217,7 @@
 				@media (prefers-color-scheme dark)
 					background #202020
 
-			&:hover
+			&:hover:not(:disabled)
 				background rgba(gray, .2)
 
 				@media (prefers-color-scheme dark)

src/dzeio/Loader/Loader.module.styl

@@ -6,6 +6,7 @@
 	width 100%
 	height 7px
 	pointer-events none
+	z-index 200
 
 	top 0
 	&.hide

src/dzeio/Loader/index.tsx

@@ -4,9 +4,22 @@ import { buildClassName } from '../Util'
 import css from './Loader.module.styl'
 
 interface Props {
+	/**
+	 * The new Percentage (if you calculate it yourself)
+	 */
 	percent?: number
+
+	/**
+	 * Auto random loader
+	 */
 	auto?: {
+		/**
+		 * the minimum and maximum interval between two increment
+		 */
 		interval: [number, number]
+		/**
+		 * the minimum and maximum incrementation (MUST be an integer)
+		 */
 		increment: [number, number]
 	}
 }
@@ -15,6 +28,11 @@ interface State {
 	percent?: number
 }
 
+/**
+ * Display a simple loading animation at the top of the page
+ * 
+ * @version 1.0.0
+ */
 export default class Loader extends React.Component<Props, State> {
 
 	public state: State = {}

src/dzeio/Navbar/Navbar.module.styl

@@ -56,7 +56,6 @@
 		position fixed
 		top 70px
 		right 0
-		padding 16px
 		border-bottom-left-radius 4px
 		transform translateX(100%)
 		background inherit
@@ -217,16 +216,19 @@
 		padding 0
 
 .userMenu
-		// padding-bottom 16px
+	padding 8px 16px
 	a
-			padding 16px 0
+		display inline-block
+		padding-bottom 16px
 
 
 .mobileMenu
 	opacity 0
 	transition opacity $transition
+	pointer-events none
 	&.shown
 		opacity 1
+		pointer-events initial
 
 .mainGradient
 	//WIP

src/dzeio/Navbar/Navbar.stories.tsx

@@ -1,6 +1,8 @@
 import { Meta, Story } from '@storybook/react/types-6-0'
 import React from 'react'
+import { Zap, ZapOff } from 'react-feather'
 import Component from '.'
+import Text from '../Text'
 
 export default {
 	title: 'DZEIO/Navbar',
@@ -9,13 +11,10 @@ export default {
 
 export const Basic: Story<any> = (args: any) => <Component {...args} />
 Basic.args = {
-	items: [{
+	type: 'navbar',
-		path: '/dashboard',
+	logo: {src: '/90-38.svg', width: 90, height: 38},
-		name: 'Dasboard'
-	}],
 	loginUrl: '/login',
 	registerUrl: '/register',
-	type: 'navbar',
 	user: {
 		name: 'Username',
 		description: 'User Description',
@@ -23,8 +22,20 @@ Basic.args = {
 			links: [{
 				path: '/logout',
 				name: 'Logout'
-			}]
+			}, {
+				path: '/logout',
+				name: 'Logout'
+			}],
+			informations: (<Text>Testing :D</Text>)
 		}
 	},
-	logo: {src: '/assets/logo.svg', width: 90, height: 38}
+	items: [{
+		path: '/dashboard',
+		name: 'Dasboard',
+		icon: Zap
+	}, {
+		path: '/dashboard',
+		name: 'Dasboard',
+		icon: ZapOff
+	}],
 }

src/dzeio/Navbar/index.tsx

@@ -68,7 +68,7 @@ interface Props {
 		name: string
 	}>
 	/**
-	 * Internal Usem don't use it !
+	 * Internal Use don't use it !
 	 */
 	mobileMenu?: () => void
 }
@@ -82,7 +82,7 @@ interface State {
 
 /**
  * Navbar/Sidebar Component
- * @version 1.0.1
+ * @version 1.0.3
  */
 export default class Navbar extends React.Component<Props, State> {
 
@@ -186,14 +186,14 @@ export default class Navbar extends React.Component<Props, State> {
 				)}
 				<ul>
 					{!this.state.isMobile && this.props.items.map((item) => (
-						<li key={item.path}><Link noStyle href={item.path}><a>
+						<li key={item.path}><Link noStyle href={item.path}>
 							<Text className={buildClassName([css.active, this.state.path?.startsWith(item.path)])}>
 								{this.getType() === 'sidebar' && item.icon && (
 									<item.icon />
 								)}
 								<span>{item.name}</span>
 							</Text>
-						</a></Link></li>
+						</Link></li>
 					))}
 				</ul>
 				<div style={{flex: 1}}></div>
@@ -224,7 +224,7 @@ export default class Navbar extends React.Component<Props, State> {
 							</div>
 						</div>
 						<div className={buildClassName(css.userMenu, [css.menuActive, !this.state.isMobile && this.state.menuActive])}>
-							<Row>
+							<Row nomargin>
 								{this.props.user.menu?.informations && (
 									<Col>{this.props.user.menu?.informations}</Col>
 								)}

src/dzeio/Row/Row.module.styl

@@ -3,14 +3,12 @@
 .row
 	display flex
 	flex-wrap wrap
-
-	&:not(.nomargin)
-		margin (0 - $gapSize) 0 0
-		padding 0 $gapSize * 2 0 $gapSize
-
-		.row:not(.nomargin)
-			padding 0
 	margin (0 - $gapSize) 0 0 (0 - $gapSize)
+	padding $gapSize
+
+	&.nomargin
+	.row
+		padding 0
 
 .nowrap
 	flex-wrap nowrap

src/dzeio/Text/index.tsx

@@ -26,6 +26,6 @@ export default class Text extends React.Component<Props> {
 			return (<p className={classes}><em>{this.props.children}</em></p>)
 		}
 
-		return React.createElement(this.props.type || 'p', {className: classes})
+		return React.createElement(this.props.type || 'p', {className: classes, children: this.props.children})
 	}
 }

src/dzeio/config.styl

@@ -1,17 +1,18 @@
 
 $main = #4285F4
 $textOnMain = white
+$mainGradient = linear-gradient(to right, $main, lighten($main, 20%))
 
-$infoDark = #304FFE
+$infoDark = #01579B
 $infoLight = #29B6F6
 
-$successDark = #388E3C
+$successDark = #1B5E20
 $successLight = #4CAF50
 
-$errorDark = #D32F2F
+$errorDark = #7F0000
 $errorLight = #F44336
 
-$warningDark = #F57C00
+$warningDark = #C43E00
 $warningLight = #FF9800
 
 $backgroundDark = #161616
@@ -44,14 +45,7 @@ rem($a)
 	($a / 16)rem
 
 // @deprecated colors
-$primary = $main
 $default = $main
-$secondary = $main
-$info = $infoLight
-$success = $successLight
-$danger = $errorLight
-$warning = $warningLight
-$darkBackground = $backgroundDark
 
 
 // See https://github.com/stylus/stylus/issues/1872#issuecomment-86553717