Skip to content

Add Editor component to the Mobile IDE View #1459

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

Merged
merged 10 commits into from
Jun 18, 2020
Merged

Add Editor component to the Mobile IDE View #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f40cd4f
:construction: mount <Editor /> component on mobile view
ghalestrilo Jun 15, 2020
fb831f5
:bug: fix basic layout issues
ghalestrilo Jun 15, 2020
11adfbf
:construction: add button to return to main view
ghalestrilo Jun 15, 2020
32dd85e
:bug: fix unused vars on IDEViewMobile
ghalestrilo Jun 15, 2020
2b17919
:lipstick: fix svg margin
ghalestrilo Jun 15, 2020
7f8138a
:bug: add correct verification to <Editor isUserOwner />
ghalestrilo Jun 15, 2020
5aa3495
:ok_hand: fix icon import
ghalestrilo Jun 16, 2020
52be7ef
:ok_hand: remove inline styles from IconLink component
ghalestrilo Jun 18, 2020
81cf415
:ok_hand: move aria-label to icon link wrapper
ghalestrilo Jun 18, 2020
a99d2b8
Add theming to common/icons
catarak Jun 18, 2020
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
25 changes: 23 additions & 2 deletions client/common/Icons.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import React from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import { remSize, prop } from '../theme';
import SortArrowUp from '../images/sort-arrow-up.svg';
import SortArrowDown from '../images/sort-arrow-down.svg';
import Github from '../images/github.svg';
import Google from '../images/google.svg';
import Plus from '../images/plus-icon.svg';
import Close from '../images/close.svg';
import Exit from '../images/exit.svg';
import DropdownArrow from '../images/down-filled-triangle.svg';

// HOC that adds the right web accessibility props
Expand All @@ -15,16 +18,33 @@ import DropdownArrow from '../images/down-filled-triangle.svg';
// Need to add size to these - like small icon, medium icon, large icon. etc.
function withLabel(SvgComponent) {
const Icon = (props) => {
const StyledIcon = styled(SvgComponent)`
&&& {
color: ${prop('Icon.default')};
& g, & path, & polygon {
opacity: 1;
fill: ${prop('Icon.default')};
}
&:hover {
color: ${prop('Icon.hover')};
& g, & path, & polygon {
opacity: 1;
fill: ${prop('Icon.hover')};
}
}
}
`;

const { 'aria-label': ariaLabel } = props;
if (ariaLabel) {
return (<SvgComponent
return (<StyledIcon
{...props}
aria-label={ariaLabel}
role="img"
focusable="false"
/>);
}
return (<SvgComponent
return (<StyledIcon
{...props}
aria-hidden
focusable="false"
Expand All @@ -48,4 +68,5 @@ export const GithubIcon = withLabel(Github);
export const GoogleIcon = withLabel(Google);
export const PlusIcon = withLabel(Plus);
export const CloseIcon = withLabel(Close);
export const ExitIcon = withLabel(Exit);
export const DropdownArrowIcon = withLabel(DropdownArrow);
25 changes: 23 additions & 2 deletions client/common/icons.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import React from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import { remSize, prop } from '../theme';
import SortArrowUp from '../images/sort-arrow-up.svg';
import SortArrowDown from '../images/sort-arrow-down.svg';
import Github from '../images/github.svg';
import Google from '../images/google.svg';
import Plus from '../images/plus-icon.svg';
import Close from '../images/close.svg';
import Exit from '../images/exit.svg';
import DropdownArrow from '../images/down-filled-triangle.svg';

// HOC that adds the right web accessibility props
Expand All @@ -15,16 +18,33 @@ import DropdownArrow from '../images/down-filled-triangle.svg';
// Need to add size to these - like small icon, medium icon, large icon. etc.
function withLabel(SvgComponent) {
const Icon = (props) => {
const StyledIcon = styled(SvgComponent)`
&&& {
color: ${prop('Icon.default')};
& g, & path, & polygon {
opacity: 1;
fill: ${prop('Icon.default')};
}
&:hover {
color: ${prop('Icon.hover')};
& g, & path, & polygon {
opacity: 1;
fill: ${prop('Icon.hover')};
}
}
}
`;

const { 'aria-label': ariaLabel } = props;
if (ariaLabel) {
return (<SvgComponent
return (<StyledIcon
{...props}
aria-label={ariaLabel}
role="img"
focusable="false"
/>);
}
return (<SvgComponent
return (<StyledIcon
{...props}
aria-hidden
focusable="false"
Expand All @@ -48,4 +68,5 @@ export const GithubIcon = withLabel(Github);
export const GoogleIcon = withLabel(Google);
export const PlusIcon = withLabel(Plus);
export const CloseIcon = withLabel(Close);
export const ExitIcon = withLabel(Exit);
export const DropdownArrowIcon = withLabel(DropdownArrow);
Loading