Skip to content

Commit

Permalink
Fix/develop (#48)
Browse files Browse the repository at this point in the history
* Add MSC directive to prevent cppcorecheck build failures on non-VS builds (microsoft#1552)

* cleaned up exception handling in loading image (microsoft#1526)

* Enable member init checks and fix errors (microsoft#1566)

* A class with only static methods and no state should just be a namespace. (microsoft#1567)

* Support OnParseAction Handler (microsoft#1570)

* Honour preexpandSingleShowCardAction and weight of fact title from HostConfig

* Addressed comments

* Support OnParseAction

* resolved minor comments

* Jwoo/ios render sync (microsoft#1547)

* make rendering to be syncronoush by default

* updated custom textblock renderer

* changes before CR

* CR update

* CR update

* [.NET] Prevent async exceptions from tearing down the process (microsoft#1561)

* Prevent unobserved exceptions from taking down the process.

If rendering fails, report the error but do not throw on a background thread.

* Add configuration to sign nuget packages

* fixed dll/project names in comments

* Fix actions parent not being set before actions are parsed (microsoft#1573)

* Replace ContainerStyle string enum with class + static fields

* Update default card

* Improve hover behavior for Image with selectAction

* Finalize support for width/height in Image and Column

* Add support for icons on action buttons

* Cleanup

* Fix handling of buttons without title

* Fix broken preExpandSingleShowCardAction handling

* Fix actions parent not being set before actions are parsed

* Enable const cppcore checks and fix fallout (microsoft#1575)

* Add Events for media play and end (microsoft#1546)

* [Android] Add vertical stretch property (microsoft#1525)

* Add vertical stretch to android

* Remove non related test file

* Fix comments in FactSetRendered

* Add tests as linked tests

* Update tests results from TestApp with new tests

* Jwoo/ios makrdown optimized (microsoft#1554)

* make rendering to be syncronoush by default

* updated custom textblock renderer

* optimized use of html rendering

* fixed factset issue

* fixed build compatability issues below iOS 11.3

* fixes before CR

* CR comments fix

* Added additional headers to public lis in framework. (microsoft#1562)

* make rendering to be syncronoush by default

* updated custom textblock renderer

* optimized use of html rendering

* fixed factset issue

* made headers public for customizing buttons

* added ACRUILable.h

* reverted wrong merge

* Enable CPPCORECHECK_DECLARATION_WARNINGS and fix errors (microsoft#1579)

* Enable Declaration warnings and first round of fixes

* Clean up remaining unnamed objects warnings and disable C26426 in enums.cpp

* added ability to scroll when there are more buttons than viewing area (microsoft#1581)

* make rendering to be syncronoush by default

* updated custom textblock renderer

* optimized use of html rendering

* fixed factset issue

* fixed build compatability issues below iOS 11.3

* fixes before CR

* added UIScrollView to ActionSet

* edits before CR

* Added sample json and updates b4 CR

* Enable "rule of five" checker, fix errors (microsoft#1585)

* Add Teams containers (microsoft#1469)

Add support for more properties in property sheet
Add initial support for snippets

* [iOS] Add vertical stretch support (microsoft#1584)

* Add vertical stretch to android

* make rendering to be syncronoush by default

* updated custom textblock renderer

* optimized use of html rendering

* fixed factset issue

* Remove non related test file

* Fix comments in FactSetRendered

* Add tests as linked tests

* Update tests results from TestApp with new tests

* Add vertical stretch for items

* Remove 'changes' from merge

* Add vertical stretch tests to solution

* Fix issue for image in columnsets rendering

* Fix issue for images being shorter than other columns in columnset

* Keep alignment leading for cards with no stretchable items

* Add new test for auto size image

* Enable all cppcorecheck class warnings and fix errors (microsoft#1601)

* Enable override checker and fix errors

* Enable function hiding warning and fix errors

* Enable all class warnings and fix errors

* [iOS] Add missing test for Vertical Stretch (microsoft#1603)

* Add missing test

* Fix spaces in json

* Update GetResource method to include type and to support media   (microsoft#1583)

* Update get resource method to include type and to support media

* Handle opening media via resource resolver when play is pressed (microsoft#1586)

Handle opening media via resource resolver when play is pressed

* Enable unit test code coverage in Debug Win32 builds (microsoft#1611)

* Test source file updates (microsoft#1551)

* Test file updates

* Jwoo/ios custom styling (microsoft#1474)

* XIB first commit

* fixes merge error

* updated InputView with XIB

updated the style of UIButtons

 added UITableViewCell xib for compact mode

removed comments

* code clean up

* added ACRbutton.xib

* Added Xib for CompactCell

* added ACRButton.xib

* allowed column with numeric width value to stretch (microsoft#1595)

* allowed column with numeric width value to stretch

* fix merge and remove spacing for the first item

* [UWP][Android][iOS] Add aesthetic fix Icons in Actions (microsoft#1612)

* Add aesthetic fix to UWP

* Aesthetic fix for android

* Aesthetic fix for iOS

* Add json test files to project

* Fix formatting

* updated showcard rendering position (microsoft#1600)

removed comments

* compact style choice set "make choice" row will reflect user choice (microsoft#1596)

* in progress

* when user chooses, user choice will be shown

* updated default message

* value is used instead of "Make Choice"

* handles cases where compact style lacking defaults (microsoft#1627)

* fixed separator issue (microsoft#1629)

* Remove Stretch from vertical content alignment (microsoft#1630)

* Jwoo/explicit image size ios (microsoft#1374)

* explicit image changes

* Added 'Explicit' enum value

* uwp changes

* uwp changes

* added explicit image sizing option for ios

* removed division

* fixes extra spacing issue in UICollectionView (microsoft#1628)

* fixes extra spacing issue in UICollectionView

* refined intrinsic content size for collection view

* fixed precision error

* fixes url loading sync issue for actions (microsoft#1641)

* fixes url loading sync issue for actions

removed hard coded image icon placement

* fixed indentation and changed variable name

* Fix media controls (microsoft#1614)

* [TS] Fixed Input.Text style and horizontalAlignment roundtrip; added test (microsoft#1636)

* Input.Text roundtrip, added test and fix

* feedback -vertical spaces

* Change private for protected in all Renderers constructors (microsoft#1649)

* Add vertical scroll support (microsoft#1650)

* Jwoo/ios custom background image loader (microsoft#1642)

* fixes url loading sync issue for actions

removed hard coded image icon placement

* allows custom BG IMG renderer

* Added CustomImageRenderer to sample

* removed CoreGraphics framework as it's not used

* added a test to ensure Unicode/Emoji support (microsoft#1647)

:shipit:

* multiline input and input limit for textview and textfield (microsoft#1643)

* initial commit for multiline input and input limit

implmt plc hld txt; rmved max len chg when not set

reverted json files

* Refactoring and code clean-up

* updated whitespaces

* Fixed newline char

* [Android] Refocus when a show card changes visibility (microsoft#1651)

* Refocus on show card

* Set focus for cards instead of input fields

* Revert "[Android] Refocus when a show card changes visibility (microsoft#1651)" (microsoft#1653)

This reverts commit f2a899a.

* 52619-to-much-padding-in-tree-view

* 52614-tree-view-is-very-messy-as-it-is-resized-to-limited-width

* Reverted to Fabric UI instead of SVGs (#33)

* Reverted to Fabric UI instead of SVGs

* Removed unnecesary comments

* Removed unnecesary CSS and duplicated one (#35)

* Fix/use hostconfig to add container styles (#36)

* background fix

* Added background color via CSS again

* Fixed some colours

* Fixed class names in CSS and HTML

* Moved interfaz to separate component

* Fixed action and add column styles

* Reverted removed commented code

* Removed CSS properties panel color modification

* Changed querySelector by getElementById

* Removed commented code

* Fix/hostconfig styles (#37)

* Changed SVGs to FabriUI Font

* Changed SVGs to FabriUI Font

* Changed aside-panel icons when folded

* Added cursor pointer to panel headers and avoided user-select it's text

* Added cursor pointer to properties/treewview panels when folded

* Added treeview icon fonts from FabricUI instead of SVGs

* Fixed treeview icons positon

* Fix/treeview implementation (#38)

* Half of treeview refactor

* Finished treeview

* Removed unnecesary btn class and fixed treeview icons position

* Removed unnecesary treeview component

* Removed outline as David Claux did to match he's style

* Mantained folded state when needed

* Removed unnecesary console.log

* Removed unnecesary icons (#39)

* Fix/minor microsoft pr changes (#40)

* Removed unnecesary icons

* Removed blank line

* Fix/phase 0 (#41)

* Changed aside panel background's color

* Maded JSON togglable

* Refactored CSS

* Fixed PR comments

* Fix/phase 0 (#43)

* Changed aside panel background's color

* Maded JSON togglable

* Refactored CSS

* Fixed PR comments

* Removed unnecesary code

* Fix/json overflow (#46)

* Fixed JSON title width

* Moved to HTML monaco-editor's nav-title

* Fixed toggle class implementation when updatingLayout in the treeview

* Fixed aside scrollbar

* Fixed properties panel label's width

* Fixed JSON panel height when toggled

* Fixed properties panel paddings and FactSet padding-right and padding-left

* Fixed treeview background-color
  • Loading branch information
IgnaciodeNuevo committed Jul 13, 2018
1 parent 59673f7 commit 857e8b1
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 26 deletions.
Expand Up @@ -31,15 +31,20 @@ a.default-ac-anchor:visited:active {

[id="treeViewSheetHost"],
[id="propertySheetHost"] {
background-color: #f9f9f9;
min-width: 205px;
position: relative;
}

.default-ac-container,
.default-ac-input {
.properties-items {
padding-left: 20px;
padding-right: 20px;
}

.default-ac-container:not(:last-of-type) {
padding-right: 10px;;
}

.default-ac-container + div {
display: none !important; /* The important overrides inline CSS properties added via JS */
}
Expand Down
15 changes: 11 additions & 4 deletions source/nodejs/adaptivecards-designer/css/card-designer.css
Expand Up @@ -107,6 +107,10 @@
padding: 6px 12px;
}

.json-wrapper .bullet__wrapper {
margin-bottom: 10px;
}

.bullet__title {
color: #000000;
white-space: nowrap;
Expand Down Expand Up @@ -165,10 +169,7 @@

.aside.is-toggled {
flex-basis: 29px;
}

.default-ac-container:last-of-type {
padding-left: 6px;
overflow: hidden;
}

.is-hidden {
Expand Down Expand Up @@ -572,6 +573,7 @@ button.treeview__icon:focus {
padding-right: 6px !important;
flex: 1 1 140px !important;
margin-left: 10px;
max-width: 34% !important;
}

.default-ac-columnSet.wrapper .default-ac-container:nth-child(3) {
Expand All @@ -588,3 +590,8 @@ button.treeview__icon:focus {
.content {
overflow-x: hidden !important;
}

.monaco-editor,
.overflow-guard {
width: 100% !important;
}
13 changes: 11 additions & 2 deletions source/nodejs/adaptivecards-designer/index.html
Expand Up @@ -70,8 +70,17 @@
</section>
</div>
<div id="horizontalSplitter" style="flex: 0 0 6px; background-color: #EEEEEE; border-top: 1px solid #D2D2D2; border-bottom: 1px solid #D2D2D2; cursor: ns-resize;"></div>
<div id="jsonEditorHost" style="flex: 0 0 auto; display: flex; height: 300px; overflow: hidden;">
<div id="loadingEditor" style="padding: 8px;">Loading editor...</div>
<div class="json-wrapper">
<nav class='bullet__wrapper js-json-menu'>
<span class='bullet__title'>JSON</span>
<span class='bullet js-host-json__bullet'>
<span class='bullet__icon js-host-json__icon'></span>
<span class='bullet__description js-host-json__description'>Hide</span>
</span>
</nav>
<div id="jsonEditorHost" style="flex: 0 0 auto; display: flex; height: 300px; overflow: hidden;">
<div id="loadingEditor" style="padding: 8px;">Loading editor...</div>
</div>
</div>
</div>
<div class="aside-panel js-aside-panel"></div>
Expand Down
15 changes: 4 additions & 11 deletions source/nodejs/adaptivecards-designer/src/app.ts
Expand Up @@ -27,16 +27,6 @@ function monacoEditorLoaded() {
function (e) {
scheduleCardRefresh();
});
const jsonSectlionTitle = `
<div class='bullet__wrapper'>
<span class='bullet__title'>JSON</span>
<span class='bullet js-host-json__bullet'>
<span class='bullet__icon js-host-json__icon'></span>
<span class='bullet__description js-host-json__description'>Hide</span>
</span>
</div>
`;
document.querySelector(".monaco-editor").insertAdjacentHTML("afterbegin", jsonSectlionTitle);
isMonacoEditorLoaded = true;
updateJsonFromCard();
app.toggleHostJsonPanel();
Expand Down Expand Up @@ -568,16 +558,19 @@ class DesignerApp {
private toggleClass(): void {
const jsonEditorPanel = document.getElementById("jsonEditorHost");
const jsonBulletDescription = document.querySelector(".js-host-json__description") as HTMLElement;
const jsonMenu = document.querySelector(".js-json-menu") as HTMLElement;

if (jsonEditorPanel.classList.contains("is-closed")) {
jsonEditorPanel.classList.remove("is-closed");
jsonEditorPanel.style.height = "300px";
jsonBulletDescription.style.display = "block";
jsonMenu.style.marginBottom = "10px";
return;
}
jsonEditorPanel.classList.add("is-closed");
jsonEditorPanel.style.height = "52px";
jsonEditorPanel.style.height = "0";
jsonBulletDescription.style.display = "none";
jsonMenu.style.marginBottom = "0";
}

public toggleHostJsonPanel(): void {
Expand Down
Expand Up @@ -80,16 +80,11 @@ export default class TreeItem {
}

updateLayout(): void {
if (this.owner.isSelected) {
this._listElement.classList.add("is-selected");
}
else {
this._listElement.classList.remove("is-selected");
}
this._listElement.classList.toggle("is-selected", this.owner.isSelected || false);
}

private foldTreeViewContainer(): void {
this._isExpanded = !this._isExpanded;
this._childContainerElement.classList.toggle("is-folded")
this._childContainerElement.classList.toggle("is-folded");
}
}

0 comments on commit 857e8b1

Please sign in to comment.