Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Refresh form UI #935

Merged
cwhitten merged 25 commits into from
Sep 26, 2019
Merged

Refresh form UI #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
60c276a
update DialogInfo types and fix demo app
a-b-r-o-w-n Sep 9, 2019
31c9033
update designer form
a-b-r-o-w-n Sep 9, 2019
83b6086
seed new dialog action with designer properties
a-b-r-o-w-n Sep 10, 2019
1ea11c6
update look and feel of property editor, pt 1
a-b-r-o-w-n Sep 11, 2019
25c9ab5
Merge branch 'master' into prompt-updates
a-b-r-o-w-n Sep 18, 2019
8390ef8
use correct peer version of react-dom
a-b-r-o-w-n Sep 18, 2019
0885e65
fix lint errors
a-b-r-o-w-n Sep 18, 2019
4a76045
seed dialog data with $type
a-b-r-o-w-n Sep 18, 2019
d5609b9
fix react error
a-b-r-o-w-n Sep 19, 2019
9829378
use default button for object array
a-b-r-o-w-n Sep 19, 2019
dc14040
add custom label and description to widgets
a-b-r-o-w-n Sep 19, 2019
5a11144
add new ui:hidden concept to ui schema
a-b-r-o-w-n Sep 19, 2019
5b89147
finish applying new look and feel to form
a-b-r-o-w-n Sep 19, 2019
f39c026
fix panel height on safari
a-b-r-o-w-n Sep 19, 2019
e6adc01
update fabric
a-b-r-o-w-n Sep 19, 2019
b23475f
Merge branch 'master' into prompt-updates
a-b-r-o-w-n Sep 20, 2019
af5b7ab
fix some fabric upgrade misses
a-b-r-o-w-n Sep 20, 2019
a63990b
port style changes to css files
a-b-r-o-w-n Sep 20, 2019
a9ed075
update spec to look for input instead of text
a-b-r-o-w-n Sep 23, 2019
cb4924e
Merge branch 'master' into prompt-updates
a-b-r-o-w-n Sep 23, 2019
2ae6fdf
fix merge conflict
a-b-r-o-w-n Sep 23, 2019
a1f45c2
update signature of seachbox.onChange
a-b-r-o-w-n Sep 23, 2019
92d015b
bump fabric to latest and fix nav styles
a-b-r-o-w-n Sep 23, 2019
e2966a7
Merge branch 'master' into prompt-updates
a-b-r-o-w-n Sep 25, 2019
e3ba87c
remove dead code
a-b-r-o-w-n Sep 25, 2019
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
1 change: 1 addition & 0 deletions Composer/.eslintrc.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ module.exports = {
},
rules: {
'react/no-deprecated': 'warn',
'react/display-name': 'off',
'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'off',

Expand Down
10 changes: 5 additions & 5 deletions Composer/cypress/integration/ToDoBot.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ context('ToDo Bot', () => {
cy.getByText('ToDoBot.Main').click();
});
cy.withinEditor('FormEditor', () => {
cy.getByText('ToDoBot.Main').should('exist');
cy.getByDisplayValue('ToDoBot.Main').should('exist');
});
});

Expand All @@ -22,7 +22,7 @@ context('ToDo Bot', () => {
});

cy.withinEditor('FormEditor', () => {
cy.getByText('AddToDo').should('exist');
cy.getByDisplayValue('AddToDo').should('exist');
});

cy.withinEditor('VisualEditor', () => {
Expand All @@ -36,7 +36,7 @@ context('ToDo Bot', () => {
});

cy.withinEditor('FormEditor', () => {
cy.getByText('ClearToDos').should('exist');
cy.getByDisplayValue('ClearToDos').should('exist');
});
cy.withinEditor('VisualEditor', () => {
cy.getByText(/Successfully cleared items/).should('exist');
Expand All @@ -49,7 +49,7 @@ context('ToDo Bot', () => {
});

cy.withinEditor('FormEditor', () => {
cy.getByText('DeleteToDo').should('exist');
cy.getByDisplayValue('DeleteToDo').should('exist');
});
cy.withinEditor('VisualEditor', () => {
cy.getByText('Edit an Array Property').should('exist');
Expand All @@ -62,7 +62,7 @@ context('ToDo Bot', () => {
});

cy.withinEditor('FormEditor', () => {
cy.getByText('ShowToDos').should('exist');
cy.getByDisplayValue('ShowToDos').should('exist');
});
cy.withinEditor('VisualEditor', () => {
cy.getByText('You have no todos.').should('exist');
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"lodash.startcase": "^4.4.0",
"mini-css-extract-plugin": "0.5.0",
"nanoid": "^2.0.1",
"office-ui-fabric-react": "^6.146.1",
"office-ui-fabric-react": "7.37.1",
Copy link
Member

@cwhitten cwhitten Sep 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A new major? Do we need to assess backwards incompatibilities?

Copy link
Contributor Author

@a-b-r-o-w-n a-b-r-o-w-n Sep 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i did a pass at this and think i covered everything. We should now be locked to that version of fabric.

"optimize-css-assets-webpack-plugin": "5.0.1",
"pnp-webpack-plugin": "1.2.1",
"postcss-flexbugs-fixes": "4.1.0",
Expand Down
53 changes: 29 additions & 24 deletions ...s/client/src/components/NavItem/styles.js → ...s/client/src/components/NavItem/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { css } from '@emotion/core';
import { FontSizes } from '@uifabric/fluent-theme';
import { NeutralColors, CommunicationColors } from '@uifabric/fluent-theme';
import { IButtonStyles } from 'office-ui-fabric-react';

export const link = (active, underTest) => css`
display: block;
text-decoration: none;
color: #4f4f4f;
position: relative;

${underTest && `pointer-events: none;`}
${!underTest &&
`&::after {
Expand Down Expand Up @@ -49,27 +51,30 @@ export const outer = css`
background-color: transparent;
`;

export const commandBarButton = active => ({
root: {
color: active ? '#000' : '#4f4f4f',
height: '36px',
width: '220px',
fontSize: `${FontSizes.size14}`,
paddingLeft: '0px',
paddingRight: '0px',
marginLeft: '0px',
backgroundColor: 'transparent',
},
icon: {
color: active ? '#000' : '#4f4f4f',
padding: '0 13px',
marginLeft: '0px',
boxSizing: 'border-box',
fontSize: `${FontSizes.size16}`,
},
textContainer: {
textAlign: 'left',
zIndex: '1',
// display: isExpand ? 'inline-block' : 'none',
},
});
export const commandBarButton = active =>
({
root: {
color: active ? '#000' : '#4f4f4f',
height: '36px',
width: '220px',
fontSize: `${FontSizes.size14}`,
paddingLeft: '0px',
paddingRight: '0px',
marginLeft: '0px',
backgroundColor: 'transparent',
},
rootDisabled: {
backgroundColor: 'transparent',
},
icon: {
color: active ? '#000' : '#4f4f4f',
padding: '0 16px',
marginLeft: '0px',
boxSizing: 'border-box',
fontSize: `${FontSizes.size16}`,
},
textContainer: {
textAlign: 'left',
zIndex: 1,
},
} as IButtonStyles);
6 changes: 4 additions & 2 deletions Composer/packages/client/src/components/ProjectTree/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,10 @@ export const ProjectTree: React.FC<IProjectTreeProps> = props => {
);
};

const onFilter = (newValue: string): void => {
setFilter(newValue);
const onFilter = (_e?: any, newValue?: string): void => {
if (typeof newValue === 'string') {
setFilter(newValue);
}
};

return (
Expand Down
4 changes: 0 additions & 4 deletions Composer/packages/client/src/pages/design/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,10 @@ export const editorWrapper = css`
`;

export const visualPanel = css`
height: 100%;
display: flex;
flex-direction: column;
flex: 1;
border-right: 1px solid #c4c4c4;
min-height: 80vh;
position: relative;
`;

Expand All @@ -77,12 +75,10 @@ export const visualEditor = css`
`;

export const formEditor = css`
height: 100%;
max-width: 600px;
flex: 1;
border: 0px;
transition: width 0.2s ease-in-out;
min-height: 80vh;
`;

export const breadcrumbClass = mergeStyleSets({
Expand Down
14 changes: 11 additions & 3 deletions .../packages/client/src/pages/home/styles.js → .../packages/client/src/pages/home/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { css } from '@emotion/core';
import { IButtonStyles } from 'office-ui-fabric-react';

export const outline = css`
display: block;
Expand Down Expand Up @@ -61,8 +62,8 @@ export const introLink = css`
width: 100%;
`;
export const link = css`
display: 'block',
textDecoration: 'none',
display: 'block';
textdecoration: 'none';
`;

export const linkContainer = css`
Expand Down Expand Up @@ -192,10 +193,17 @@ export const footer = css`
`;

export const button = () => {
const normal = {
const normal: IButtonStyles = {
root: {
marginLeft: '84px',
marginTop: '43px',
background: 'transparent',
},
rootHovered: {
background: 'transparent',
},
rootChecked: {
background: 'transparent',
},
icon: {
fontSize: '24px',
Expand Down
3 changes: 3 additions & 0 deletions Composer/packages/client/src/pages/language-generation/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ export const LGPage = props => {
},
},
},
chevronButton: {
backgroundColor: 'transparent',
},
}}
selectedKey={isRoot ? '_all' : subPath}
groups={navLinks}
Expand Down
3 changes: 3 additions & 0 deletions Composer/packages/client/src/pages/language-understanding/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ export const LUPage = props => {
},
},
},
chevronButton: {
backgroundColor: 'transparent',
},
}}
selectedKey={isRoot ? '_all' : subPath}
groups={navLinks}
Expand Down
Loading