Aug 5, 2022 · Jul 30, 2022 · Jul 31, 2022 · Jul 31, 2022 · Jul 31, 2022 · Jul 31, 2022
diff --git a/src/DatePicker/DatePicker.tsx b/src/DatePicker/DatePicker.tsx
diff --git a/src/Window/Window.mdx b/src/Window/Window.mdx
diff --git a/src/Window/Window.stories.tsx b/src/Window/Window.stories.tsx
diff --git a/src/Window/Window.tsx b/src/Window/Window.tsx
diff --git a/src/WindowContent/WindowContent.spec.tsx → src/Window/WindowContent.spec.tsx b/src/WindowContent/WindowContent.spec.tsx → src/Window/WindowContent.spec.tsx
diff --git a/src/WindowContent/WindowContent.tsx → src/Window/WindowContent.tsx b/src/WindowContent/WindowContent.tsx → src/Window/WindowContent.tsx
diff --git a/src/WindowHeader/WindowHeader.spec.tsx → src/Window/WindowHeader.spec.tsx b/src/WindowHeader/WindowHeader.spec.tsx → src/Window/WindowHeader.spec.tsx
diff --git a/src/WindowHeader/WindowHeader.tsx → src/Window/WindowHeader.tsx b/src/WindowHeader/WindowHeader.tsx → src/Window/WindowHeader.tsx
diff --git a/src/index.ts b/src/index.ts
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,9 +7,7 @@ import { ScrollView } from '../ScrollView/ScrollView';
		import { Select } from '../Select/Select';
		import { SelectChangeEvent } from '../Select/Select.types';
		import { Toolbar } from '../Toolbar/Toolbar';
	import { Window } from '../Window/Window';
	import { WindowContent } from '../WindowContent/WindowContent';
	import { WindowHeader } from '../WindowHeader/WindowHeader';
	import { Window, WindowContent, WindowHeader } from '../Window/Window';

		type DatePickerProps = {
		className?: string;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,7 +13,7 @@ import styled from 'styled-components';
		const Wrapper = styled.div`
		padding: 5rem;
		background: ${({ theme }) => theme.desktopBackground};
	.window-header {
	.window-title {
		display: flex;
		align-items: center;
		justify-content: space-between;
Expand Down Expand Up		@@ -63,7 +63,7 @@ const Wrapper = styled.div`
		`;

		export default {
	title: 'Window',
	title: 'Environment/Window',
		component: Window,
		subcomponents: { WindowHeader, WindowContent },
		decorators: [story => <Wrapper>{story()}</Wrapper>]
Expand All		@@ -73,7 +73,7 @@ export function Default() {
		return (
		<>
		<Window resizable className='window'>
	<WindowHeader className='window-header'>
	<WindowHeader className='window-title'>
		<span>react95.exe</span>
		<Button>
		<span className='close-icon' />
Expand Down Expand Up		@@ -103,7 +103,7 @@ export function Default() {
		</Window>

		<Window className='window'>
	<WindowHeader active={false} className='window-header'>
	<WindowHeader active={false} className='window-title'>
		<span>not-active.exe</span>
		<Button>
		<span className='close-icon' />
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,16 +47,26 @@ const ResizeHandle = styled.span`
		`}
		`;

	const Window = forwardRef<HTMLDivElement, WindowProps>(function Window(
	{ children, resizable = false, resizeRef, shadow = true, ...otherProps },
	ref
	) {
	return (
	<StyledWindow ref={ref} shadow={shadow} {...otherProps}>
	{children}
	{resizable && <ResizeHandle data-testid='resizeHandle' ref={resizeRef} />}
	</StyledWindow>
	);
	});
	const Window = forwardRef<HTMLDivElement, WindowProps>(
	(
	{ children, resizable = false, resizeRef, shadow = true, ...otherProps },
	ref
	) => {
	return (
	<StyledWindow ref={ref} shadow={shadow} {...otherProps}>
	{children}
	{resizable && (
	<ResizeHandle data-testid='resizeHandle' ref={resizeRef} />
	)}
	</StyledWindow>
	);
	}
	);

	Window.displayName = 'Window';

	export * from './WindowContent';

	export * from './WindowHeader';

		export { Window, WindowProps };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,4 +21,6 @@ const WindowContent = forwardRef<HTMLDivElement, WindowContentProps>(
		}
		);

	WindowContent.displayName = 'WindowContent';

		export { WindowContent, WindowContentProps };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,8 +31,6 @@ export * from './Toolbar/Toolbar';
		export * from './Tooltip/Tooltip';
		export * from './TreeView/TreeView';
		export * from './Window/Window';
	export * from './WindowContent/WindowContent';
	export * from './WindowHeader/WindowHeader';

		/* deprecated components */
		export * from './legacy/Bar';
Expand Down