Skip to content
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.

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

Merge 0.37.x into master #2105

Merged
merged 7 commits into from
Feb 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

<a name="0.37.3"></a>

## 0.37.3 (2021-02-17)

### Bug fixes

* [ide] Prevent toggling helpbox by "h" key when interacting with text inputs (#2101)

<a name="0.37.2"></a>

## 0.37.2 (2021-01-25)
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"packages": [
"packages/*"
],
"version": "0.37.2"
"version": "0.37.3"
}
4 changes: 2 additions & 2 deletions packages/xod-client-browser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xod-client-browser",
"version": "0.37.0",
"version": "0.37.3",
"description": "XOD project: Client browser application",
"scripts": {
"build:tutorial-project": "node ./tools/loadTutorialProject.js",
Expand All @@ -25,7 +25,7 @@
"redux-thunk": "^2.1.0",
"url-parse": "^1.2.0",
"xod-arduino": "^0.37.0",
"xod-client": "^0.37.0",
"xod-client": "^0.37.3",
"xod-func-tools": "^0.34.0",
"xod-project": "^0.37.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/xod-client-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "AGPL-3.0",
"main": "src-babel/app/main.js",
"name": "xod-client-electron",
"version": "0.37.2",
"version": "0.37.3",
"scripts": {
"build:workspace": "cpx \"../../workspace/**/*\" \"src-babel/workspace\"",
"build:gui": "webpack --colors",
Expand Down Expand Up @@ -44,7 +44,7 @@
"redux-thunk": "^2.1.0",
"serialport": "^9.0.4",
"xod-arduino": "^0.37.0",
"xod-client": "^0.37.0",
"xod-client": "^0.37.3",
"xod-deploy": "^0.37.0",
"xod-deploy-bin": "^0.37.0",
"xod-fs": "^0.37.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/xod-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xod-client",
"version": "0.37.0",
"version": "0.37.3",
"description": "XOD project: Client application",
"scripts": {
"build": "babel src/ -d dist/ --source-maps",
Expand Down
5 changes: 4 additions & 1 deletion packages/xod-client/src/core/containers/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,10 @@ export default class App extends React.Component {
[COMMAND.UNDO]: this.props.actions.undoCurrentPatch,
[COMMAND.REDO]: this.props.actions.redoCurrentPatch,
[COMMAND.HIDE_HELPBOX]: this.props.actions.hideHelpbox,
[COMMAND.TOGGLE_HELP]: this.props.actions.toggleHelp,
[COMMAND.TOGGLE_HELP]: event => {
if (isInputTarget(event)) return;
this.props.actions.toggleHelp();
},
[COMMAND.INSERT_NODE]: event => {
if (isInputTarget(event)) return;
this.props.actions.showSuggester(null);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
@mixin scrollable-attachment($top, $scroll: scroll) {
position: absolute;
top: $top;
bottom: 0;
left: 0;
right: 0;
overflow: $scroll;
}

.AttachmentEditors {
display: flex;
width: 100%;
Expand All @@ -16,15 +25,16 @@
&.isActive {
display: flex;
flex-flow: column;
position: relative;
}

.cpp-editor {
display: flex;
flex-grow: 1;
position: relative;

.ReactCodeMirror {
width: 100%;
height: auto;
@include scrollable-attachment(0, hidden);
}
.CodeMirror-line, .CodeMirror-line * {
cursor: text;
Expand All @@ -35,13 +45,7 @@
}

.tabtest-editor {
position: absolute;
top: 40px;
bottom: 0;
left: 0;
right: 0;
overflow: scroll;

@include scrollable-attachment(40px);
@include styled-scrollbar();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
}

.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
background-color: white; /* The little square between H and V scrollbars */
/* The little square between H and V scrollbars */
opacity: 0;
}

/* GUTTER */
Expand Down
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-cloud/basics/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Nodes to get some basic data from the XOD Cloud API",
"license": "AGPL-3.0",
"name": "basics",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-cloud/feeds/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Nodes for communicating with the XOD Cloud Feeds service",
"license": "AGPL-3.0",
"name": "feeds",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/dht/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"description": "Nodes to work with DHT11 or DHT21 sensors, or compatible sensors: RHT01, DHT22, DHT33, DHT44, AM2301, HM2301, AM2302, AM2303, RHT02, RHT03, RHT04, RHT05.",
"license": "AGPL-3.0",
"name": "dht",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/ds-rtc/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "This library operates DS1302/DS1307/DS3231 based breakout RTC boards",
"license": "AGPL-3.0",
"name": "ds-rtc",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/esp8266-mcu/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Support for ESP8266-based MCUs.",
"license": "AGPL-3.0",
"name": "esp8266-mcu",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/esp8266/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Support for ESP8266 as a slave module",
"license": "AGPL-3.0",
"name": "esp8266",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/hc-sr04/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"description": "Nodes to work with the HC-SR04 ultrasonic range meters.",
"license": "AGPL-3.0",
"name": "hc-sr04",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/pn532-nfc/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"description": "Support for RFID/NFC modules based on a PN532 chip.",
"license": "MIT",
"name": "pn532-nfc",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/servo/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Nodes to control RC hobby servos",
"license": "AGPL-3.0",
"name": "servo",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/sharp-irm/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Nodes to read analog infrared range meters by Sharp (GP2Y0A) and convert the signal to distance values.",
"license": "AGPL-3.0",
"name": "sharp-irm",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/ssd1306-display/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"description": "Nodes to drive SD1306-based monochrome LCDs with I2C interface.",
"license": "AGPL-3.0",
"name": "ssd1306-display",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/st-mems/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"description": "Nodes to work with gyroscopes, accelerometers and barometers based on chips by STMicroelectronics: L3G4200, L3GD20H, LIS331DLH, LIS331HH, LIS3DH, LPS331.",
"license": "AGPL-3.0",
"name": "st-mems",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/st7735-display/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"description": "Nodes to drive ST7735 based TFT LCD displays. This library supports 128x160 resolution displays which are connected through the hardware SPI interface. Physically, some displays based on the 7735 chip may differ from each other and have different sets of instructions for initialization. To solve this, the library contains several device nodes for different types of displays. These nodes are labeled \"B\", \"G\", \"RG\", and \"RR\".",
"license": "AGPL-3.0",
"name": "st7735-display",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/text-lcd/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"description": "Nodes to drive a common text liquid crystal displays with I²C or parallel interfaces.",
"license": "AGPL-3.0",
"name": "text-lcd",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/w5500/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Support for ethernet shields that use Wiznet W5500 chipset.",
"license": "AGPL-3.0",
"name": "w5500",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod-dev/ws2812/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"description": "Nodes to work with WS2812 (NeoPixel). The main difference from the other libraries that this library does not use a buffer to light up the LEDs. So it gives a possibility to light up a really long LED strip with a small microcontroller without a huge amount of RAM.",
"license": "AGPL-3.0",
"name": "ws2812",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/bits/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Low-level bits and bytes operations",
"license": "AGPL-3.0",
"name": "bits",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/color/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Library to work with color",
"license": "AGPL-3.0",
"name": "color",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/common-hardware/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Hardware drivers for popular and simple peripherals",
"license": "AGPL-3.0",
"name": "common-hardware",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/core/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "The very basic nodes of XOD",
"license": "AGPL-3.0",
"name": "core",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/datetime/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Date and timestamp operations",
"license": "AGPL-3.0",
"name": "datetime",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/debug/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Debug nodes for XOD",
"license": "AGPL-3.0",
"name": "debug",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/gpio/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Nodes of XOD to deal with GPIO (hardware pins)",
"license": "AGPL-3.0",
"name": "gpio",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/graphics/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Nodes to work with graphics in XOD",
"license": "AGPL-3.0",
"name": "graphics",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/i2c/project.xod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "My fork of \"xod/i2c\"",
"name": "i2c",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/json/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"description": "Nodes for parsing JSON from a stream of characters",
"license": "AGPL-3.0",
"name": "json",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/math/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Nodes of XOD for basic mathematical operations",
"license": "AGPL-3.0",
"name": "math",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/mutex/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Library to work with mutually exclusive resources. Useful to avoid conflicts between nodes controlling long-running processes.",
"license": "AGPL-3.0",
"name": "mutex",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/net/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "General types and operations to manage network connections",
"license": "AGPL-3.0",
"name": "net",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/stream/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Nodes to process sequences of bytes one by one",
"license": "AGPL-3.0",
"name": "stream",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/uart/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Provides constructors and Nodes to interact with UARTs (Software, Hardware, USB) in XOD.",
"license": "AGPL-3.0",
"name": "uart",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/units/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Units of measurement conversions",
"license": "AGPL-3.0",
"name": "units",
"version": "0.37.2"
"version": "0.37.3"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/waves/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "A collection of nodes that generate wave signals",
"license": "AGPL",
"name": "waves",
"version": "0.37.2"
"version": "0.37.3"
}