Skip to content

Commit e6c63aa

Browse files
samdentyCompuIves
authored andcommitted
Switch over to console-feed for the Console component (codesandbox#712)
* Update package.json * Switch to console-feed * Fix * Update package.json * Update yarn.lock * Revert "Update yarn.lock" This reverts commit 33651cb. * Result + Command icons * Fix * Fix directly evaluating object Scenario: Try entering `{a:1}` in the console Before: returns 1 After: returns the objects, as expected * Fix * Check existence * Show root messages
1 parent fb5abaf commit e6c63aa

File tree

14 files changed

+295
-708
lines changed

14 files changed

+295
-708
lines changed

packages/app/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
"codesandbox-import-utils": "^1.2.7",
123123
"color": "^0.11.4",
124124
"compare-versions": "^3.1.0",
125+
"console-feed": "^2.5.0",
125126
"css-modules-loader-core": "^1.1.0",
126127
"cssnano": "^3.10.0",
127128
"debug": "^2.6.8",
@@ -139,6 +140,7 @@
139140
"hash-sum": "^1.0.2",
140141
"humps": "CompuIves/humps",
141142
"immer": "^0.8.5",
143+
"immutability-helper": "^2.6.6",
142144
"is-url": "^1.2.2",
143145
"jest-circus": "^22.1.4",
144146
"jest-snapshot": "^22.1.2",

packages/app/src/app/components/Preview/DevTools/Console/Message/elements.js

Lines changed: 0 additions & 82 deletions
This file was deleted.

packages/app/src/app/components/Preview/DevTools/Console/Message/index.js

Lines changed: 0 additions & 112 deletions
This file was deleted.

packages/app/src/app/components/Preview/DevTools/Console/elements.js

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import styled from 'styled-components';
2+
import theme from 'common/theme';
23

34
export const Container = styled.div`
45
background-color: ${props => props.theme.background};
@@ -25,3 +26,67 @@ export const IconContainer = styled.div`
2526
align-items: center;
2627
justify-content: center;
2728
`;
29+
30+
export const inspectorTheme = {
31+
PADDING: '0.4rem 1.5rem 0.4rem 0px',
32+
33+
LOG_ICON: '',
34+
LOG_BORDER: '#191C1D',
35+
LOG_ICON_HEIGHT: '26px',
36+
LOG_ICON_WIDTH: '1em',
37+
38+
LOG_COMMAND_ICON: `url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' fill='rgba(255, 255, 255, 0.8)' viewBox='0 0 40 40'%3e%3cpath d='M16.6 10l10 10-10 10-2.3-2.3L22 20l-7.7-7.7z'/%3e%3c/svg%3e")`,
39+
LOG_RESULT_ICON: `url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' fill='rgba(255, 255, 255, 0.8)' preserveAspectRatio='xMidYMid meet' viewBox='0 0 40 40'%3e%3cg%3e%3cpath d='m22 30.7q0 0.3-0.2 0.5l-1.1 1.1q-0.3 0.3-0.6 0.3t-0.5-0.3l-10.4-10.4q-0.2-0.2-0.2-0.5t0.2-0.5l10.4-10.4q0.3-0.2 0.5-0.2t0.6 0.2l1.1 1.1q0.2 0.3 0.2 0.5t-0.2 0.6l-8.8 8.7 8.8 8.8q0.2 0.2 0.2 0.5z m8.6 0q0 0.3-0.3 0.5l-1.1 1.1q-0.2 0.3-0.5 0.3t-0.5-0.3l-10.4-10.4q-0.2-0.2-0.2-0.5t0.2-0.5l10.4-10.4q0.2-0.2 0.5-0.2t0.5 0.2l1.1 1.1q0.3 0.3 0.3 0.5t-0.3 0.6l-8.7 8.7 8.7 8.8q0.3 0.2 0.3 0.5z'%3e%3c/path%3e%3c/g%3e%3c/svg%3e")`,
40+
41+
LOG_WARN_COLOR: 'rgb(245, 211, 150)',
42+
LOG_WARN_BACKGROUND: '#332A00',
43+
LOG_WARN_BORDER: '#665500',
44+
LOG_WARN_ICON: `url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23F5D396' viewBox='0 0 40 40'%3e%3cpath d='M21.6 23.4v-6.8h-3.2v6.8h3.2zm0 6.6v-3.4h-3.2V30h3.2zm-20 5L20 3.4 38.4 35H1.6z'/%3e%3c/svg%3e")`,
45+
46+
LOG_ERROR_COLOR: 'rgb(254, 127, 127)',
47+
LOG_ERROR_BACKGROUND: '#280000',
48+
LOG_ERROR_BORDER: '#5B0000',
49+
LOG_ERROR_ICON: `url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23FE7F7F' viewBox='0 0 40 40'%3e%3cpath d='M21.6 21.6v-10h-3.2v10h3.2zm0 6.8V25h-3.2v3.4h3.2zM20 3.4a16.6 16.6 0 1 1 0 33.2 16.6 16.6 0 1 1 0-33.2z'/%3e%3c/svg%3e")`,
50+
51+
BASE_FONT_FAMILY: 'Menlo, monospace',
52+
BASE_FONT_SIZE: '13px',
53+
BASE_LINE_HEIGHT: '18px',
54+
55+
BASE_BACKGROUND_COLOR: 'rgba(0, 0, 0, 0)',
56+
BASE_COLOR: 'rgb(213, 213, 213)',
57+
58+
OBJECT_NAME_COLOR: theme.secondary(),
59+
OBJECT_VALUE_NULL_COLOR: 'rgb(127, 127, 127)',
60+
OBJECT_VALUE_UNDEFINED_COLOR: 'rgb(127, 127, 127)',
61+
OBJECT_VALUE_REGEXP_COLOR: '#fac863',
62+
OBJECT_VALUE_STRING_COLOR: '#fac863',
63+
OBJECT_VALUE_SYMBOL_COLOR: '#fac863',
64+
OBJECT_VALUE_NUMBER_COLOR: 'hsl(252, 100%, 75%)',
65+
OBJECT_VALUE_BOOLEAN_COLOR: 'hsl(252, 100%, 75%)',
66+
OBJECT_VALUE_FUNCTION_KEYWORD_COLOR: 'rgb(242, 85, 217)',
67+
68+
HTML_TAG_COLOR: 'rgb(93, 176, 215)',
69+
HTML_TAGNAME_COLOR: 'rgb(93, 176, 215)',
70+
HTML_TAGNAME_TEXT_TRANSFORM: 'lowercase',
71+
HTML_ATTRIBUTE_NAME_COLOR: 'rgb(155, 187, 220)',
72+
HTML_ATTRIBUTE_VALUE_COLOR: 'rgb(242, 151, 102)',
73+
HTML_COMMENT_COLOR: 'rgb(137, 137, 137)',
74+
HTML_DOCTYPE_COLOR: 'rgb(192, 192, 192)',
75+
76+
ARROW_COLOR: 'rgb(145, 145, 145)',
77+
ARROW_MARGIN_RIGHT: 3,
78+
ARROW_FONT_SIZE: 11,
79+
80+
TREENODE_FONT_FAMILY: 'Menlo, monospace',
81+
TREENODE_FONT_SIZE: '13px',
82+
TREENODE_LINE_HEIGHT: '16px',
83+
TREENODE_PADDING_LEFT: 12,
84+
85+
TABLE_BORDER_COLOR: 'rgb(85, 85, 85)',
86+
TABLE_TH_BACKGROUND_COLOR: 'rgb(44, 44, 44)',
87+
TABLE_TH_HOVER_COLOR: 'rgb(48, 48, 48)',
88+
TABLE_SORT_ICON_COLOR: 'black',
89+
TABLE_DATA_BACKGROUND_IMAGE:
90+
'linear-gradient(rgba(255, 255, 255, 0), rgba(255, 255, 255, 0) 50%, rgba(51, 139, 255, 0.0980392) 50%, rgba(51, 139, 255, 0.0980392))',
91+
TABLE_DATA_BACKGROUND_SIZE: '128px 32px',
92+
};

0 commit comments

Comments
 (0)