Critical fix

src/script/ui/data/schema/struct-schema.js

@@ -121,7 +121,7 @@ export const rgroupSchema = {
 	title: 'R-group',
 	type: 'object',
 	properties: {
-		rgroupValues: {
+		values: {
 			type: 'array',
 			items: {
 				type: 'string',

src/script/ui/dialog/toolbox/rgroup.jsx

@@ -23,17 +23,17 @@ import Dialog from '../../component/dialog';
 import Form, { Field } from '../../component/form/form';
 import ButtonList from '../../component/buttonlist';
 
-function RGroup({ disabledIds, rgroupValues, formState, type, ...props }) { // eslint-disable-line
+function RGroup({ disabledIds, values, formState, type, ...props }) { // eslint-disable-line
 	return (
 		<Dialog
 			title="R-Group"
 			className="rgroup"
 			params={props}
 			result={() => formState.result}
 		>
-			<Form schema={rgroupSchema} init={{ rgroupValues }} {...formState} >
+			<Form schema={rgroupSchema} init={{ values }} {...formState} >
 				<Field
-					name="rgroupValues"
+					name="values"
 					multiple={type === 'atom'}
 					labelPos={false}
 					component={ButtonList}

src/script/ui/state/editor/index.js

@@ -66,7 +66,7 @@ export default function initEditor(dispatch, getState) {
 				const rgroups = getState().editor.struct().rgroups;
 				const params = {
 					type: 'atom',
-					rgroupValues: elem.values,
+					values: elem.values,
 					disabledIds: Array.from(rgroups.entries())
 						.reduce((acc, [rgid, rg]) => {
 							if (rg.frags.has(elem.fragId))
@@ -75,12 +75,15 @@ export default function initEditor(dispatch, getState) {
 							return acc;
 						}, [])
 				};
-				dlg = openDialog(dispatch, 'rgroup', params);
+				dlg = openDialog(dispatch, 'rgroup', params).then(res => ({
+					values: res.values,
+					type: 'rlabel'
+				}));
 			} else {
 				dlg = openDialog(dispatch, 'period-table', elem);
 			}
 
-			return dlg.then(res => toElement(Object.assign(elem, { values: res.rgroupValues })));
+			return dlg.then(toElement);
 		},
 		onQuickEdit: atom => openDialog(dispatch, 'labelEdit', atom),
 		onBondEdit: bond => openDialog(dispatch, 'bondProps', fromBond(bond))
@@ -105,10 +108,10 @@ export default function initEditor(dispatch, getState) {
 				}, []);
 			const params = {
 				type: 'fragment',
-				rgroupValues: [rgroup.label],
+				values: [rgroup.label],
 				disabledIds
 			};
-			return openDialog(dispatch, 'rgroup', params).then(res => ({ label: res.rgroupValues[0] }));
+			return openDialog(dispatch, 'rgroup', params).then(res => ({ label: res.values[0] }));
 		},
 		onSgroupEdit: sgroup => sleep(0)		// huck to open dialog after dispatch sgroup tool action
 			.then(() => openDialog(dispatch, 'sgroup', fromSgroup(sgroup)))

src/script/ui/state/modal/form.js

@@ -17,8 +17,6 @@
 import { getDefaultOptions } from '../../data/schema/options-schema';
 import { initSdata, sdataReducer } from './sdata';
 
-export const rgroupValues = Array.from(new Array(32), (val, index) => 'R' + ++index);
-
 export const formsState = { // TODO: create from schema.{smth}.defaultValue
 	atomProps: {
 		errors: {},
@@ -74,7 +72,7 @@ export const formsState = { // TODO: create from schema.{smth}.defaultValue
 		errors: {},
 		valid: true,
 		result: {
-			rgroupValues
+			values: []
 		}
 	},
 	rgroupLogic: {